Merge pull request #2232 from vr4manta/SPLAT-2078

openshift-merge-bot[bot] · web-flow · commit 8fcc4e71758a · 2025-04-09T15:52:50.000Z
SPLAT-2078: Removed VSphereStaticIPs feature gate
diff --git a/features.md b/features.md
@@ -96,5 +96,4 @@
 | SetEIPForNLBIngressController| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereDriverConfiguration| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereMultiVCenters| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
-| VSphereStaticIPs| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ValidatingAdmissionPolicy| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -227,14 +227,6 @@ var (
 					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
-	FeatureGateVSphereStaticIPs = newFeatureGate("VSphereStaticIPs").
-					reportProblemsToJiraComponent("splat").
-					contactPerson("rvanderp3").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
-
 	FeatureGateRouteExternalCertificate = newFeatureGate("RouteExternalCertificate").
 						reportProblemsToJiraComponent("router").
 						contactPerson("thejasn").
diff --git a/payload-command/render/renderassets/rendered_manifests_test.go b/payload-command/render/renderassets/rendered_manifests_test.go
@@ -108,7 +108,6 @@ status:
     - name: NodeSwap
     - name: RouteExternalCertificate
     - name: SigstoreImageVerification
-    - name: VSphereStaticIPs
     - name: ValidatingAdmissionPolicy
     enabled:
     - name: AlibabaPlatform
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -303,9 +303,6 @@
                     {
                         "name": "VSphereMultiVCenters"
                     },
-                    {
-                        "name": "VSphereStaticIPs"
-                    },
                     {
                         "name": "ValidatingAdmissionPolicy"
                     }
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -299,9 +299,6 @@
                     {
                         "name": "VSphereMultiVCenters"
                     },
-                    {
-                        "name": "VSphereStaticIPs"
-                    },
                     {
                         "name": "ValidatingAdmissionPolicy"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -299,9 +299,6 @@
                     {
                         "name": "VSphereMultiVCenters"
                     },
-                    {
-                        "name": "VSphereStaticIPs"
-                    },
                     {
                         "name": "ValidatingAdmissionPolicy"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -303,9 +303,6 @@
                     {
                         "name": "VSphereMultiVCenters"
                     },
-                    {
-                        "name": "VSphereStaticIPs"
-                    },
                     {
                         "name": "ValidatingAdmissionPolicy"
                     }
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -299,9 +299,6 @@
                     {
                         "name": "VSphereMultiVCenters"
                     },
-                    {
-                        "name": "VSphereStaticIPs"
-                    },
                     {
                         "name": "ValidatingAdmissionPolicy"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -299,9 +299,6 @@
                     {
                         "name": "VSphereMultiVCenters"
                     },
-                    {
-                        "name": "VSphereStaticIPs"
-                    },
                     {
                         "name": "ValidatingAdmissionPolicy"
                     },

Original file line number	Diff line number	Diff line change
`@@ -303,9 +303,6 @@`
`303`	`303`	`{`
`304`	`304`	`"name": "VSphereMultiVCenters"`
`305`	`305`	`},`
`306`		`- {`
`307`		`- "name": "VSphereStaticIPs"`
`308`		`- },`
`309`	`306`	`{`
`310`	`307`	`"name": "ValidatingAdmissionPolicy"`
`311`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -299,9 +299,6 @@`
`299`	`299`	`{`
`300`	`300`	`"name": "VSphereMultiVCenters"`
`301`	`301`	`},`
`302`		`- {`
`303`		`- "name": "VSphereStaticIPs"`
`304`		`- },`
`305`	`302`	`{`
`306`	`303`	`"name": "ValidatingAdmissionPolicy"`
`307`	`304`	`},`