OCPBUGS-55673: Remove IngressControllerLBSubnetsAWS featuregate

grzpiotrowski · grzpiotrowski · commit 1f8364ba1841 · 2025-07-10T21:03:27.000+01:00
The IngressControllerLBSubnetsAWS feature gate was at first introduced as TPNU in OpenShift 4.17 and was promoted to Default in the same release. The feature gate has been enabled by default for 3 releases, so it is scheduled to be removed imminently. This commit addresses OCPBUGS-55673: https://issues.redhat.com/browse/OCPBUGS-55673
diff --git a/features.md b/features.md
@@ -77,7 +77,6 @@
 | GatewayAPI| <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>  |
 | GatewayAPIController| <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>  |
 | HardwareSpeed| <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>  |
-| IngressControllerLBSubnetsAWS| <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>  |
 | KMSv1| <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>  |
 | MachineConfigNodes| <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>  |
 | ManagedBootImages| <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
@@ -610,14 +610,6 @@ var (
 						enhancementPR(legacyFeatureGateWithoutEnhancement).
 						mustRegister()
 
-	FeatureGateIngressControllerLBSubnetsAWS = newFeatureGate("IngressControllerLBSubnetsAWS").
-							reportProblemsToJiraComponent("Routing").
-							contactPerson("miciah").
-							productScope(ocpSpecific).
-							enhancementPR(legacyFeatureGateWithoutEnhancement).
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
-
 	FeatureGateImageStreamImportMode = newFeatureGate("ImageStreamImportMode").
 						reportProblemsToJiraComponent("Multi-Arch").
 						contactPerson("psundara").
diff --git a/operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml b/operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml
@@ -1,8 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "Ingress"
 crdName: ingresscontrollers.operator.openshift.io
-featureGates:
-- IngressControllerLBSubnetsAWS
 tests:
   onCreate:
     - name: Should be able to create a minimal ingresscontroller with an CLB with subnets using IDs and names.
diff --git a/operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController+IngressControllerLBSubnetsAWS.yaml b/operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController+IngressControllerLBSubnetsAWS.yaml
@@ -3,7 +3,6 @@ name: "IngressController"
 crdName: ingresscontrollers.operator.openshift.io
 featureGates:
 - SetEIPForNLBIngressController
-- IngressControllerLBSubnetsAWS
 tests:
   onCreate:
     - name: Should be able to create a minimal IngressController
diff --git a/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-CustomNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-CustomNoUpgrade.crd.yaml
@@ -7,6 +7,7 @@ metadata:
     capability.openshift.io/name: Ingress
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    release.openshift.io/feature-set: CustomNoUpgrade
   name: ingresscontrollers.operator.openshift.io
 spec:
   group: operator.openshift.io
diff --git a/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-Default.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-Default.crd.yaml
diff --git a/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-DevPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-DevPreviewNoUpgrade.crd.yaml
diff --git a/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-TechPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-TechPreviewNoUpgrade.crd.yaml
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -246,9 +246,6 @@
                     {
                         "name": "HardwareSpeed"
                     },
-                    {
-                        "name": "IngressControllerLBSubnetsAWS"
-                    },
                     {
                         "name": "KMSv1"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -158,9 +158,6 @@
                     {
                         "name": "IngressControllerDynamicConfigurationManager"
                     },
-                    {
-                        "name": "IngressControllerLBSubnetsAWS"
-                    },
                     {
                         "name": "InsightsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -164,9 +164,6 @@
                     {
                         "name": "IngressControllerDynamicConfigurationManager"
                     },
-                    {
-                        "name": "IngressControllerLBSubnetsAWS"
-                    },
                     {
                         "name": "InsightsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -243,9 +243,6 @@
                     {
                         "name": "HardwareSpeed"
                     },
-                    {
-                        "name": "IngressControllerLBSubnetsAWS"
-                    },
                     {
                         "name": "KMSv1"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -143,9 +143,6 @@
                     {
                         "name": "IngressControllerDynamicConfigurationManager"
                     },
-                    {
-                        "name": "IngressControllerLBSubnetsAWS"
-                    },
                     {
                         "name": "InsightsConfig"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -149,9 +149,6 @@
                     {
                         "name": "IngressControllerDynamicConfigurationManager"
                     },
-                    {
-                        "name": "IngressControllerLBSubnetsAWS"
-                    },
                     {
                         "name": "InsightsConfig"
                     },

Original file line number	Diff line number	Diff line change
`@@ -246,9 +246,6 @@`
`246`	`246`	`{`
`247`	`247`	`"name": "HardwareSpeed"`
`248`	`248`	`},`
`249`		`- {`
`250`		`- "name": "IngressControllerLBSubnetsAWS"`
`251`		`- },`
`252`	`249`	`{`
`253`	`250`	`"name": "KMSv1"`
`254`	`251`	`},`
Original file line number	Diff line number	Diff line change
`@@ -158,9 +158,6 @@`
`158`	`158`	`{`
`159`	`159`	`"name": "IngressControllerDynamicConfigurationManager"`
`160`	`160`	`},`
`161`		`- {`
`162`		`- "name": "IngressControllerLBSubnetsAWS"`
`163`		`- },`
`164`	`161`	`{`
`165`	`162`	`"name": "InsightsConfig"`
`166`	`163`	`},`