Skip to content

Commit 5a3f389

Browse files
committed
OCPBUGS-55673: Remove IngressControllerLBSubnetsAWS featuregate
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
1 parent 674ad74 commit 5a3f389

16 files changed

+635
-6368
lines changed

features.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
| 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> |
7878
| 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> |
7979
| 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> |
80-
| 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> |
8180
| 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> |
8281
| 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> |
8382
| 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> |

features/features.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -610,14 +610,6 @@ var (
610610
enhancementPR(legacyFeatureGateWithoutEnhancement).
611611
mustRegister()
612612

613-
FeatureGateIngressControllerLBSubnetsAWS = newFeatureGate("IngressControllerLBSubnetsAWS").
614-
reportProblemsToJiraComponent("Routing").
615-
contactPerson("miciah").
616-
productScope(ocpSpecific).
617-
enhancementPR(legacyFeatureGateWithoutEnhancement).
618-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
619-
mustRegister()
620-
621613
FeatureGateImageStreamImportMode = newFeatureGate("ImageStreamImportMode").
622614
reportProblemsToJiraComponent("Multi-Arch").
623615
contactPerson("psundara").

operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
22
name: "Ingress"
33
crdName: ingresscontrollers.operator.openshift.io
4-
featureGates:
5-
- IngressControllerLBSubnetsAWS
64
tests:
75
onCreate:
86
- name: Should be able to create a minimal ingresscontroller with an CLB with subnets using IDs and names.

operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController+IngressControllerLBSubnetsAWS.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: "IngressController"
33
crdName: ingresscontrollers.operator.openshift.io
44
featureGates:
55
- SetEIPForNLBIngressController
6-
- IngressControllerLBSubnetsAWS
76
tests:
87
onCreate:
98
- name: Should be able to create a minimal IngressController

operator/v1/types_ingress.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -797,15 +797,14 @@ type AWSClassicLoadBalancerParameters struct {
797797
// in the status of the IngressController object.
798798
//
799799
// +optional
800-
// +openshift:enable:FeatureGate=IngressControllerLBSubnetsAWS
801800
Subnets *AWSSubnets `json:"subnets,omitempty"`
802801
}
803802

804803
// AWSNetworkLoadBalancerParameters holds configuration parameters for an
805804
// AWS Network load balancer. For Example: Setting AWS EIPs https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html
806-
// +openshift:validation:FeatureGateAwareXValidation:requiredFeatureGate=SetEIPForNLBIngressController;IngressControllerLBSubnetsAWS,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"
807-
// +openshift:validation:FeatureGateAwareXValidation:requiredFeatureGate=SetEIPForNLBIngressController;IngressControllerLBSubnetsAWS,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"
808-
// +openshift:validation:FeatureGateAwareXValidation:requiredFeatureGate=SetEIPForNLBIngressController;IngressControllerLBSubnetsAWS,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"
805+
// +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"
806+
// +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"
807+
// +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"
809808
type AWSNetworkLoadBalancerParameters struct {
810809
// subnets specifies the subnets to which the load balancer will
811810
// attach. The subnets may be specified by either their
@@ -821,7 +820,6 @@ type AWSNetworkLoadBalancerParameters struct {
821820
// in the status of the IngressController object.
822821
//
823822
// +optional
824-
// +openshift:enable:FeatureGate=IngressControllerLBSubnetsAWS
825823
Subnets *AWSSubnets `json:"subnets,omitempty"`
826824

827825
// eipAllocations is a list of IDs for Elastic IP (EIP) addresses that

operator/v1/zz_generated.featuregated-crd-manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,7 @@ ingresscontrollers.operator.openshift.io:
177177
Capability: Ingress
178178
Category: ""
179179
FeatureGates:
180-
- IngressControllerLBSubnetsAWS
181180
- SetEIPForNLBIngressController
182-
- SetEIPForNLBIngressController+IngressControllerLBSubnetsAWS
183181
FilenameOperatorName: ingress
184182
FilenameOperatorOrdering: "00"
185183
FilenameRunLevel: "0000_50"

0 commit comments

Comments
 (0)