Merge pull request #9560 from vr4manta/SPLAT-2078

SPLAT-2078: Removed VSphereStaticIPs feature gate

Author: openshift-merge-bot[bot]

pkg/types/validation/featuregate_test.go

@@ -67,24 +67,11 @@ func TestFeatureGates(t *testing.T) {
 			installConfig: func() *types.InstallConfig {
 				c := validInstallConfig()
 				c.FeatureSet = v1.CustomNoUpgrade
-				c.FeatureGates = []string{"VSphereStaticIPs=true"}
 				c.VSphere = validVSpherePlatform()
 				c.VSphere.Hosts = []*vsphere.Host{{Role: "test"}}
 				return c
 			}(),
 		},
-		{
-			name: "vSphere hosts is not allowed with custom Feature Gate disabled",
-			installConfig: func() *types.InstallConfig {
-				c := validInstallConfig()
-				c.FeatureSet = v1.CustomNoUpgrade
-				c.FeatureGates = []string{"VSphereStaticIPs=false"}
-				c.VSphere = validVSpherePlatform()
-				c.VSphere.Hosts = []*vsphere.Host{{Role: "test"}}
-				return c
-			}(),
-			expected: `^platform.vsphere.hosts: Forbidden: this field is protected by the VSphereStaticIPs feature gate which must be enabled through either the TechPreviewNoUpgrade or CustomNoUpgrade feature set$`,
-		},
 		{
 			name: "vSphere one vcenter is allowed with default Feature Gates",
 			installConfig: func() *types.InstallConfig {

pkg/types/vsphere/validation/featuregates.go

@@ -27,11 +27,6 @@ func GatedFeatures(c *types.InstallConfig) []featuregates.GatedInstallConfigFeat
 	computeDefs := c.Compute
 
 	return []featuregates.GatedInstallConfigFeature{
-		{
-			FeatureGateName: features.FeatureGateVSphereStaticIPs,
-			Condition:       len(v.Hosts) > 0,
-			Field:           field.NewPath("platform", "vsphere", "hosts"),
-		},
 		{
 			FeatureGateName: features.FeatureGateVSphereMultiNetworks,
 			Condition:       multiNetworksFound,