Skip to content

Commit 6cc917e

Browse files
committed
Prohibit suggestion port to be set in suggestion config
1 parent caa08c8 commit 6cc917e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

pkg/controller.v1beta1/suggestion/composer/composer.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ func (g *General) DesiredDeployment(s *suggestionsv1beta1.Suggestion) (*appsv1.D
7676
if err != nil {
7777
return nil, err
7878
}
79+
if containsContainerPortWithName(suggestionConfigData.Ports, consts.DefaultSuggestionPortName) ||
80+
containsContainerPort(suggestionConfigData.Ports, consts.DefaultSuggestionPort) {
81+
return nil, fmt.Errorf("invalid suggestion config: a port with name %q or number %d must not be specified",
82+
consts.DefaultSuggestionPortName, consts.DefaultSuggestionPort)
83+
}
7984

8085
// If early stopping is used, get the config data.
8186
earlyStoppingConfigData := katibconfig.EarlyStoppingConfig{}
@@ -195,14 +200,11 @@ func (g *General) desiredContainers(s *suggestionsv1beta1.Suggestion,
195200
suggestionContainer.Name = consts.ContainerSuggestion
196201
}
197202

198-
if !containsContainerPortWithName(suggestionContainer.Ports, consts.DefaultSuggestionPortName) &&
199-
!containsContainerPort(suggestionConfigData.Ports, consts.DefaultSuggestionPort) {
200-
suggestionPort := corev1.ContainerPort{
201-
Name: consts.DefaultSuggestionPortName,
202-
ContainerPort: consts.DefaultSuggestionPort,
203-
}
204-
suggestionContainer.Ports = append(suggestionContainer.Ports, suggestionPort)
203+
suggestionPort := corev1.ContainerPort{
204+
Name: consts.DefaultSuggestionPortName,
205+
ContainerPort: consts.DefaultSuggestionPort,
205206
}
207+
suggestionContainer.Ports = append(suggestionContainer.Ports, suggestionPort)
206208

207209
if viper.GetBool(consts.ConfigEnableGRPCProbeInSuggestion) && suggestionContainer.ReadinessProbe == nil {
208210
suggestionContainer.ReadinessProbe = &corev1.Probe{

0 commit comments

Comments
 (0)