From c2d3105d45c1c9f61bc34ebc770da47c803e3be6 Mon Sep 17 00:00:00 2001
From: Wenjin Situ <jsitu@amazon.com>
Date: Wed, 12 Apr 2023 15:29:04 -0700
Subject: [PATCH] update aws-load-balancer version

---
 .../base/kustomization.yaml                   |  2 +-
 .../base/load_balancer_controller.yaml        | 41 +++----------------
 tests/e2e/utils/kubeflow_installation.py      |  2 +-
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/awsconfigs/common/aws-alb-ingress-controller/base/kustomization.yaml b/awsconfigs/common/aws-alb-ingress-controller/base/kustomization.yaml
index 2179aec2ab..2875e52bfa 100644
--- a/awsconfigs/common/aws-alb-ingress-controller/base/kustomization.yaml
+++ b/awsconfigs/common/aws-alb-ingress-controller/base/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: kube-system
 resources:
 # Manifests downloaded from:
-# https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.4.1/v2_4_1_full.yaml
+# https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.4.7/v2_4_7_full.yaml
 # change from original manifest is in Deployment named aws-load-balancer-controller for controller container args: --cluster-name=$(CLUSTER_NAME)
 - load_balancer_controller.yaml
 commonLabels:
diff --git a/awsconfigs/common/aws-alb-ingress-controller/base/load_balancer_controller.yaml b/awsconfigs/common/aws-alb-ingress-controller/base/load_balancer_controller.yaml
index 8976f30a61..592e15dd1d 100644
--- a/awsconfigs/common/aws-alb-ingress-controller/base/load_balancer_controller.yaml
+++ b/awsconfigs/common/aws-alb-ingress-controller/base/load_balancer_controller.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   labels:
     app.kubernetes.io/name: aws-load-balancer-controller
@@ -133,6 +133,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               scheme:
                 description: Scheme defines the scheme for all Ingresses that belong
                   to IngressClass with this IngressClassParams.
@@ -162,18 +163,12 @@ spec:
     served: true
     storage: true
     subresources: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   labels:
     app.kubernetes.io/name: aws-load-balancer-controller
@@ -516,6 +511,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               serviceRef:
                 description: serviceRef is a reference to a Kubernetes Service and
                   ServicePort.
@@ -562,12 +558,6 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -820,10 +810,9 @@ spec:
     spec:
       containers:
       - args:
-        # change from original manifest
         - --cluster-name=$(CLUSTER_NAME)
         - --ingress-class=alb
-        image: amazon/aws-alb-ingress-controller:v2.4.1
+        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.4.7
         livenessProbe:
           failureThreshold: 2
           httpGet:
@@ -1000,23 +989,3 @@ webhooks:
     resources:
     - ingresses
   sideEffects: None
----
-apiVersion: elbv2.k8s.aws/v1beta1
-kind: IngressClassParams
-metadata:
-  labels:
-    app.kubernetes.io/name: aws-load-balancer-controller
-  name: alb
----
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
-metadata:
-  labels:
-    app.kubernetes.io/name: aws-load-balancer-controller
-  name: alb
-spec:
-  controller: ingress.k8s.aws/alb
-  parameters:
-    apiGroup: elbv2.k8s.aws
-    kind: IngressClassParams
-    name: alb
diff --git a/tests/e2e/utils/kubeflow_installation.py b/tests/e2e/utils/kubeflow_installation.py
index b407ef76d1..cc1cccf73d 100644
--- a/tests/e2e/utils/kubeflow_installation.py
+++ b/tests/e2e/utils/kubeflow_installation.py
@@ -236,7 +236,7 @@ def install_alb_controller(cluster_name):
             --set clusterName={cluster_name} \
             --set serviceAccount.create=false \
             --set serviceAccount.name=aws-load-balancer-controller \
-            --version v1.4.3"
+            --version v1.4.8"
     )