diff --git a/pkg/types/validation/installconfig.go b/pkg/types/validation/installconfig.go index 253e0d7d915..0d6530bbfa2 100644 --- a/pkg/types/validation/installconfig.go +++ b/pkg/types/validation/installconfig.go @@ -214,10 +214,6 @@ func ValidateInstallConfig(c *types.InstallConfig, usingAgentMethod bool) field. allErrs = append(allErrs, field.Invalid(field.NewPath("additionalEnabledCapabilities"), c.Capabilities.AdditionalEnabledCapabilities, "platform baremetal requires the baremetal capability")) } - if !enabledCaps.Has(configv1.ClusterVersionCapabilityIngress) { - allErrs = append(allErrs, field.Invalid(field.NewPath("additionalEnabledCapabilities"), c.Capabilities.AdditionalEnabledCapabilities, - "the Ingress capability is required")) - } } if !enabledCaps.Has(configv1.ClusterVersionCapabilityCloudCredential) { @@ -238,6 +234,11 @@ func ValidateInstallConfig(c *types.InstallConfig, usingAgentMethod bool) field. "disabling CloudControllerManager on External platform supported only with cloudControllerManager value none")) } } + + if !enabledCaps.Has(configv1.ClusterVersionCapabilityIngress) { + allErrs = append(allErrs, field.Invalid(field.NewPath("capabilities"), c.Capabilities, + "the Ingress capability is required")) + } } allErrs = append(allErrs, ValidateFeatureSet(c)...) diff --git a/pkg/types/validation/installconfig_test.go b/pkg/types/validation/installconfig_test.go index ff825d14bf4..3884603b6e8 100644 --- a/pkg/types/validation/installconfig_test.go +++ b/pkg/types/validation/installconfig_test.go @@ -1559,7 +1559,7 @@ func TestValidateInstallConfig(t *testing.T) { installConfig: func() *types.InstallConfig { c := validInstallConfig() c.Capabilities = &types.Capabilities{BaselineCapabilitySet: "v4.11"} - c.Capabilities.AdditionalEnabledCapabilities = append(c.Capabilities.AdditionalEnabledCapabilities, configv1.ClusterVersionCapabilityCloudCredential, configv1.ClusterVersionCapabilityCloudControllerManager) + c.Capabilities.AdditionalEnabledCapabilities = append(c.Capabilities.AdditionalEnabledCapabilities, configv1.ClusterVersionCapabilityCloudCredential, configv1.ClusterVersionCapabilityCloudControllerManager, configv1.ClusterVersionCapabilityIngress) return c }(), }, @@ -1606,7 +1606,7 @@ func TestValidateInstallConfig(t *testing.T) { installConfig: func() *types.InstallConfig { c := validInstallConfig() c.Capabilities = &types.Capabilities{BaselineCapabilitySet: "v4.11"} - c.Capabilities.AdditionalEnabledCapabilities = append(c.Capabilities.AdditionalEnabledCapabilities, configv1.ClusterVersionCapabilityCloudCredential, configv1.ClusterVersionCapabilityOpenShiftSamples, configv1.ClusterVersionCapabilityCloudControllerManager) + c.Capabilities.AdditionalEnabledCapabilities = append(c.Capabilities.AdditionalEnabledCapabilities, configv1.ClusterVersionCapabilityCloudCredential, configv1.ClusterVersionCapabilityOpenShiftSamples, configv1.ClusterVersionCapabilityCloudControllerManager, configv1.ClusterVersionCapabilityIngress) return c }(), },