OCPBUGS-55649: Remove SetEIPForNLBIngressController feature gate

rikatz · rikatz · commit 2c1760a06430 · 2025-10-01T10:18:41.000-03:00
This change removes the Feature gate SetEIPForNLBIngressController from
the API.

The FG is not used anymore by cluster-ingress-operator and is not required
to be part of the code anymore.

Additionally, the FG has been enabled by default since 4.18 and can be safely
removed
diff --git a/features.md b/features.md
@@ -97,7 +97,6 @@
 | RouteAdvertisements| <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>  |
 | RouteExternalCertificate| <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>  |
 | ServiceAccountTokenNodeBinding| <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>  |
-| 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>  |
 | SigstoreImageVerification| <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>  |
 | StoragePerformantSecurityPolicy| <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>  |
 | UpgradeStatus| <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
@@ -68,14 +68,6 @@ var (
 				enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 				mustRegister()
 
-	FeatureGateSetEIPForNLBIngressController = newFeatureGate("SetEIPForNLBIngressController").
-							reportProblemsToJiraComponent("Networking / router").
-							contactPerson("miheer").
-							productScope(ocpSpecific).
-							enhancementPR(legacyFeatureGateWithoutEnhancement).
-							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-							mustRegister()
-
 	FeatureGateOpenShiftPodSecurityAdmission = newFeatureGate("OpenShiftPodSecurityAdmission").
 							reportProblemsToJiraComponent("auth").
 							contactPerson("ibihim").
diff --git a/operator/v1/tests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml b/operator/v1/tests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml
@@ -1,8 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "IngressController"
 crdName: ingresscontrollers.operator.openshift.io
-featureGates:
-- SetEIPForNLBIngressController
 tests:
   onCreate:
     - name: Should be able to create a minimal IngressController
diff --git a/operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController+IngressControllerLBSubnetsAWS.yaml b/operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController+IngressControllerLBSubnetsAWS.yaml
@@ -1,8 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "IngressController"
 crdName: ingresscontrollers.operator.openshift.io
-featureGates:
-- SetEIPForNLBIngressController
 tests:
   onCreate:
     - name: Should be able to create a minimal IngressController
diff --git a/operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml b/operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml
@@ -1,8 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "IngressController"
 crdName: ingresscontrollers.operator.openshift.io
-featureGates:
-- SetEIPForNLBIngressController
 tests:
   onCreate:
     - name: Should be able to create a minimal IngressController
diff --git a/operator/v1/types_ingress.go b/operator/v1/types_ingress.go
@@ -460,7 +460,7 @@ var (
 type CIDR string
 
 // LoadBalancerStrategy holds parameters for a load balancer.
-// +openshift:validation:FeatureGateAwareXValidation:featureGate=SetEIPForNLBIngressController,rule="!has(self.scope) || self.scope != 'Internal' || !has(self.providerParameters) || !has(self.providerParameters.aws) || !has(self.providerParameters.aws.networkLoadBalancer) || !has(self.providerParameters.aws.networkLoadBalancer.eipAllocations)",message="eipAllocations are forbidden when the scope is Internal."
+// +kubebuilder:validation:XValidation:rule="!has(self.scope) || self.scope != 'Internal' || !has(self.providerParameters) || !has(self.providerParameters.aws) || !has(self.providerParameters.aws.networkLoadBalancer) || !has(self.providerParameters.aws.networkLoadBalancer.eipAllocations)",message="eipAllocations are forbidden when the scope is Internal."
 // +kubebuilder:validation:XValidation:rule=`!has(self.scope) || self.scope != 'Internal' || !has(self.providerParameters) || !has(self.providerParameters.openstack) || !has(self.providerParameters.openstack.floatingIP) || self.providerParameters.openstack.floatingIP == ""`,message="cannot specify a floating ip when scope is internal"
 type LoadBalancerStrategy struct {
 	// scope indicates the scope at which the load balancer is exposed.
@@ -802,9 +802,9 @@ type AWSClassicLoadBalancerParameters struct {
 
 // AWSNetworkLoadBalancerParameters holds configuration parameters for an
 // AWS Network load balancer. For Example: Setting AWS EIPs https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html
-// +openshift:validation:FeatureGateAwareXValidation:requiredFeatureGate=SetEIPForNLBIngressController,rule=`has(self.subnets) && has(self.subnets.ids) && has(self.subnets.names) && has(self.eipAllocations) ? size(self.subnets.ids + self.subnets.names) == size(self.eipAllocations) : true`,message="number of subnets must be equal to number of eipAllocations"
-// +openshift:validation:FeatureGateAwareXValidation:requiredFeatureGate=SetEIPForNLBIngressController,rule=`has(self.subnets) && has(self.subnets.ids) && !has(self.subnets.names) && has(self.eipAllocations) ? size(self.subnets.ids) == size(self.eipAllocations) : true`,message="number of subnets must be equal to number of eipAllocations"
-// +openshift:validation:FeatureGateAwareXValidation:requiredFeatureGate=SetEIPForNLBIngressController,rule=`has(self.subnets) && has(self.subnets.names) && !has(self.subnets.ids) && has(self.eipAllocations) ? size(self.subnets.names) == size(self.eipAllocations) : true`,message="number of subnets must be equal to number of eipAllocations"
+// +kubebuilder:validation:XValidation:rule=`has(self.subnets) && has(self.subnets.ids) && has(self.subnets.names) && has(self.eipAllocations) ? size(self.subnets.ids + self.subnets.names) == size(self.eipAllocations) : true`,message="number of subnets must be equal to number of eipAllocations"
+// +kubebuilder:validation:XValidation:rule=`has(self.subnets) && has(self.subnets.ids) && !has(self.subnets.names) && has(self.eipAllocations) ? size(self.subnets.ids) == size(self.eipAllocations) : true`,message="number of subnets must be equal to number of eipAllocations"
+// +kubebuilder:validation:XValidation:rule=`has(self.subnets) && has(self.subnets.names) && !has(self.subnets.ids) && has(self.eipAllocations) ? size(self.subnets.names) == size(self.eipAllocations) : true`,message="number of subnets must be equal to number of eipAllocations"
 type AWSNetworkLoadBalancerParameters struct {
 	// subnets specifies the subnets to which the load balancer will
 	// attach. The subnets may be specified by either their
@@ -835,7 +835,6 @@ type AWSNetworkLoadBalancerParameters struct {
 	// See https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html for general
 	// information about configuration, characteristics, and limitations of Elastic IP addresses.
 	//
-	// +openshift:enable:FeatureGate=SetEIPForNLBIngressController
 	// +optional
 	// +listType=atomic
 	// +kubebuilder:validation:XValidation:rule=`self.all(x, self.exists_one(y, x == y))`,message="eipAllocations cannot contain duplicates"
diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml
@@ -7,7 +7,6 @@ metadata:
     api.openshift.io/filename-operator: ingress
     api.openshift.io/filename-ordering: "00"
     capability.openshift.io/name: Ingress
-    feature-gate.release.openshift.io/SetEIPForNLBIngressController: "true"
   name: ingresscontrollers.operator.openshift.io
 spec:
   group: operator.openshift.io
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -306,9 +306,6 @@
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
-                    {
-                        "name": "SetEIPForNLBIngressController"
-                    },
                     {
                         "name": "SigstoreImageVerification"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -284,9 +284,6 @@
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
-                    {
-                        "name": "SetEIPForNLBIngressController"
-                    },
                     {
                         "name": "SignatureStores"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -287,9 +287,6 @@
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
-                    {
-                        "name": "SetEIPForNLBIngressController"
-                    },
                     {
                         "name": "SignatureStores"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -306,9 +306,6 @@
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
-                    {
-                        "name": "SetEIPForNLBIngressController"
-                    },
                     {
                         "name": "SigstoreImageVerification"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -284,9 +284,6 @@
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
-                    {
-                        "name": "SetEIPForNLBIngressController"
-                    },
                     {
                         "name": "SignatureStores"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -287,9 +287,6 @@
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
-                    {
-                        "name": "SetEIPForNLBIngressController"
-                    },
                     {
                         "name": "SignatureStores"
                     },

Original file line number	Diff line number	Diff line change
`@@ -306,9 +306,6 @@`
`306`	`306`	`{`
`307`	`307`	`"name": "ServiceAccountTokenNodeBinding"`
`308`	`308`	`},`
`309`		`- {`
`310`		`- "name": "SetEIPForNLBIngressController"`
`311`		`- },`
`312`	`309`	`{`
`313`	`310`	`"name": "SigstoreImageVerification"`
`314`	`311`	`},`
Original file line number	Diff line number	Diff line change
`@@ -284,9 +284,6 @@`
`284`	`284`	`{`
`285`	`285`	`"name": "ServiceAccountTokenNodeBinding"`
`286`	`286`	`},`
`287`		`- {`
`288`		`- "name": "SetEIPForNLBIngressController"`
`289`		`- },`
`290`	`287`	`{`
`291`	`288`	`"name": "SignatureStores"`
`292`	`289`	`},`
Original file line number	Diff line number	Diff line change
`@@ -287,9 +287,6 @@`
`287`	`287`	`{`
`288`	`288`	`"name": "ServiceAccountTokenNodeBinding"`
`289`	`289`	`},`
`290`		`- {`
`291`		`- "name": "SetEIPForNLBIngressController"`
`292`		`- },`
`293`	`290`	`{`
`294`	`291`	`"name": "SignatureStores"`
`295`	`292`	`},`