NE-1516: Adds a field in the cluster ingress config object and Ingres…

…s Controller to set EIP via installer and Ingress Controller `config/v1/types_ingress.go` - Adds an API field `eip-allocations` in the cluster ingress config object whose value is set by the installer using install-config.yaml `operator/v1/types_ingress.go` - Adds an API field `eip-allocations` in the Ingress Controller CR object using which the Ingress Operator scales an Ingress Controller with service type balancer whose annotation `service.beta.kubernetes.io/aws-load-balancer-eip-allocations` is set by the value of the field `eip-allocations` of the Ingress Controller. Epic: https://issues.redhat.com/browse/NE-1274 Story: https://issues.redhat.com/browse/NE-1516
openshift · Mar 23, 2024 · ed72b77 · ed72b77
1 parent 6e22bae
commit ed72b77
Show file tree

Hide file tree

Showing 11 changed files with 148 additions and 7 deletions.
diff --git a/config/v1/types_ingress.go b/config/v1/types_ingress.go
@@ -151,8 +151,22 @@ type AWSIngressSpec struct {
 	// +kubebuilder:validation:Enum:=NLB;Classic
 	// +kubebuilder:validation:Required
 	Type AWSLBType `json:"type,omitempty"`
+
+	// networkLoadBalancerParameters holds configuration parameters for an AWS
+	// network load balancer. Present only if type is NLB.
+	//
+	// +optional
+	NetworkLoadBalancerParameters *AWSNetworkLoadBalancerParameters `json:"networkLoadBalancer,omitempty"`
 }
 
+// AWSNetworkLoadBalancerParameters holds configuration parameters for an
+// AWS Network load balancer.
+type AWSNetworkLoadBalancerParameters struct {
+	EIPAllocations EIPAllocations `json:"eip-allocations,omitempty"`
+}
+
+type EIPAllocations string
+
 type AWSLBType string
 
 const (

diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_ingresses.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_ingresses.crd.yaml
@@ -134,6 +134,14 @@ spec:
                         description: aws contains settings specific to the Amazon
                           Web Services infrastructure provider.
                         properties:
+                          networkLoadBalancer:
+                            description: networkLoadBalancerParameters holds configuration
+                              parameters for an AWS network load balancer. Present
+                              only if type is NLB.
+                            properties:
+                              eip-allocations:
+                                type: string
+                            type: object
                           type:
                             description: "type allows user to set a load balancer
                               type. When this field is set the default ingresscontroller

diff --git a/config/v1/zz_generated.deepcopy.go b/config/v1/zz_generated.deepcopy.go
diff --git a/...v1/zz_generated.featuregated-crd-manifests/ingresses.config.openshift.io/AAA_ungated.yaml b/...v1/zz_generated.featuregated-crd-manifests/ingresses.config.openshift.io/AAA_ungated.yaml
@@ -134,6 +134,14 @@ spec:
                         description: aws contains settings specific to the Amazon
                           Web Services infrastructure provider.
                         properties:
+                          networkLoadBalancer:
+                            description: networkLoadBalancerParameters holds configuration
+                              parameters for an AWS network load balancer. Present
+                              only if type is NLB.
+                            properties:
+                              eip-allocations:
+                                type: string
+                            type: object
                           type:
                             description: "type allows user to set a load balancer
                               type. When this field is set the default ingresscontroller

diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go
diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4137,6 +4137,10 @@
       "description": "AWSIngressSpec holds the desired state of the Ingress for Amazon Web Services infrastructure provider. This only includes fields that can be modified in the cluster.",
       "type": "object",
       "properties": {
+        "networkLoadBalancer": {
+          "description": "networkLoadBalancerParameters holds configuration parameters for an AWS network load balancer. Present only if type is NLB.",
+          "$ref": "#/definitions/com.github.openshift.api.config.v1.AWSNetworkLoadBalancerParameters"
+        },
         "type": {
           "description": "type allows user to set a load balancer type. When this field is set the default ingresscontroller will get created using the specified LBType. If this field is not set then the default ingress controller of LBType Classic will be created. Valid values are:\n\n* \"Classic\": A Classic Load Balancer that makes routing decisions at either\n  the transport layer (TCP/SSL) or the application layer (HTTP/HTTPS). See\n  the following for additional details:\n\n    https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#clb\n\n* \"NLB\": A Network Load Balancer that makes routing decisions at the\n  transport layer (TCP/SSL). See the following for additional details:\n\n    https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#nlb",
           "type": "string"
@@ -4145,10 +4149,21 @@
       "x-kubernetes-unions": [
         {
           "discriminator": "type",
-          "fields-to-discriminateBy": {}
+          "fields-to-discriminateBy": {
+            "networkLoadBalancer": "NetworkLoadBalancerParameters"
+          }
         }
       ]
     },
+    "com.github.openshift.api.config.v1.AWSNetworkLoadBalancerParameters": {
+      "description": "AWSNetworkLoadBalancerParameters holds configuration parameters for an AWS Network load balancer.",
+      "type": "object",
+      "properties": {
+        "eip-allocations": {
+          "type": "string"
+        }
+      }
+    },
     "com.github.openshift.api.config.v1.AWSPlatformSpec": {
       "description": "AWSPlatformSpec holds the desired state of the Amazon Web Services infrastructure provider. This only includes fields that can be modified in the cluster.",
       "type": "object",
@@ -25107,7 +25122,12 @@
     },
     "com.github.openshift.api.operator.v1.AWSNetworkLoadBalancerParameters": {
       "description": "AWSNetworkLoadBalancerParameters holds configuration parameters for an AWS Network load balancer.",
-      "type": "object"
+      "type": "object",
+      "properties": {
+        "eip-allocations": {
+          "type": "string"
+        }
+      }
     },
     "com.github.openshift.api.operator.v1.AccessLogging": {
       "description": "AccessLogging describes how client requests should be logged.",

diff --git a/operator/v1/types_ingress.go b/operator/v1/types_ingress.go
@@ -635,8 +635,11 @@ type AWSClassicLoadBalancerParameters struct {
 // AWSNetworkLoadBalancerParameters holds configuration parameters for an
 // AWS Network load balancer.
 type AWSNetworkLoadBalancerParameters struct {
+	EIPAllocations EIPAllocations `json:"eip-allocations,omitempty"`
 }
 
+type EIPAllocations string
+
 // HostNetworkStrategy holds parameters for the HostNetwork endpoint publishing
 // strategy.
 type HostNetworkStrategy struct {

diff --git a/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers.crd.yaml
@@ -285,6 +285,9 @@ spec:
                                 description: networkLoadBalancerParameters holds configuration
                                   parameters for an AWS network load balancer. Present
                                   only if type is NLB.
+                                properties:
+                                  eip-allocations:
+                                    type: string
                                 type: object
                               type:
                                 description: "type is the type of AWS load balancer
@@ -1910,6 +1913,9 @@ spec:
                                 description: networkLoadBalancerParameters holds configuration
                                   parameters for an AWS network load balancer. Present
                                   only if type is NLB.
+                                properties:
+                                  eip-allocations:
+                                    type: string
                                 type: object
                               type:
                                 description: "type is the type of AWS load balancer

diff --git a/...ated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml b/...ated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml
@@ -285,6 +285,9 @@ spec:
                                 description: networkLoadBalancerParameters holds configuration
                                   parameters for an AWS network load balancer. Present
                                   only if type is NLB.
+                                properties:
+                                  eip-allocations:
+                                    type: string
                                 type: object
                               type:
                                 description: "type is the type of AWS load balancer
@@ -1892,6 +1895,9 @@ spec:
                                 description: networkLoadBalancerParameters holds configuration
                                   parameters for an AWS network load balancer. Present
                                   only if type is NLB.
+                                properties:
+                                  eip-allocations:
+                                    type: string
                                 type: object
                               type:
                                 description: "type is the type of AWS load balancer

diff --git a/payload-manifests/crds/0000_10_config-operator_01_ingresses.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_ingresses.crd.yaml
@@ -134,6 +134,14 @@ spec:
                         description: aws contains settings specific to the Amazon
                           Web Services infrastructure provider.
                         properties:
+                          networkLoadBalancer:
+                            description: networkLoadBalancerParameters holds configuration
+                              parameters for an AWS network load balancer. Present
+                              only if type is NLB.
+                            properties:
+                              eip-allocations:
+                                type: string
+                            type: object
                           type:
                             description: "type allows user to set a load balancer
                               type. When this field is set the default ingresscontroller