Merge pull request #16316 from yurrriq/lbc-v2.7.0

Upgrade AWS Load Balancer Controller to v2.7.0
2024-02-02 23:25:20 -08:00 · 2024-02-02 23:25:20 -08:00 · 18670063f2
parent 75059dbd41 acc0fd7757
commit 18670063f2
15 changed files with 18 additions and 18 deletions
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -929,7 +929,7 @@ spec:
          value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
          value: /var/run/secrets/amazonaws.com/token
-        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2
+        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.7.0
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -148,7 +148,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
+    manifestHash: 866b908b73a7c0083d20b055aefbc9745d3076fd5f5b5ae7e64e6bd2db3e7942
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -929,7 +929,7 @@ spec:
          value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
          value: /var/run/secrets/amazonaws.com/token
-        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2
+        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.7.0
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -163,7 +163,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
+    manifestHash: 866b908b73a7c0083d20b055aefbc9745d3076fd5f5b5ae7e64e6bd2db3e7942
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -929,7 +929,7 @@ spec:
          value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
          value: /var/run/secrets/amazonaws.com/token
-        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2
+        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.7.0
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -170,7 +170,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
+    manifestHash: 866b908b73a7c0083d20b055aefbc9745d3076fd5f5b5ae7e64e6bd2db3e7942
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -929,7 +929,7 @@ spec:
          value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
          value: /var/run/secrets/amazonaws.com/token
-        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2
+        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.7.0
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -170,7 +170,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
+    manifestHash: 866b908b73a7c0083d20b055aefbc9745d3076fd5f5b5ae7e64e6bd2db3e7942
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -929,7 +929,7 @@ spec:
          value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
        - name: AWS_WEB_IDENTITY_TOKEN_FILE
          value: /var/run/secrets/amazonaws.com/token
-        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2
+        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.7.0
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -171,7 +171,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
+    manifestHash: 866b908b73a7c0083d20b055aefbc9745d3076fd5f5b5ae7e64e6bd2db3e7942
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -939,7 +939,7 @@ spec:
            fieldRef:
              apiVersion: v1
              fieldPath: spec.nodeName
-        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2
+        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.7.0
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -163,7 +163,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 4b7e10379beabe347fe4d72ddfc00ae77daab278c65251f5a8a56a6e91c2a907
+    manifestHash: 7d093be57b67cd3fc018a8e251e2db73e72b6d4592d645a3be5503a6bebe0d52
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -939,7 +939,7 @@ spec:
            fieldRef:
              apiVersion: v1
              fieldPath: spec.nodeName
-        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2
+        image: public.ecr.aws/eks/aws-load-balancer-controller:v2.7.0
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content
@ -163,7 +163,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: ea17759bdf2e9ace58d6cd23a0f5f0697736eef8e52a25a30c3bbef8b77aaa48
+    manifestHash: b92c8546fc7af32373da80f802287a5c6a5fc491e074c729d4e323f8441c5e7c
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/upup/models/cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template
+++ b/upup/models/cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template
@ -1,5 +1,5 @@
 {{- with .CloudProvider.AWS.LoadBalancerController }}
-# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.6.2/v2_6_2_full.yaml
+# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.7.0/v2_7_0_full.yaml
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@ -895,7 +895,7 @@ spec:
            fieldRef:
              apiVersion: v1
              fieldPath: spec.nodeName
-        image: public.ecr.aws/eks/aws-load-balancer-controller:{{ or .Version "v2.6.2" }}
+        image: public.ecr.aws/eks/aws-load-balancer-controller:{{ or .Version "v2.7.0" }}
        livenessProbe:
          failureThreshold: 2
          httpGet:
@ -1149,12 +1149,13 @@ webhooks:
    - ingresses
  sideEffects: None
 ---
+# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.7.0/v2_7_0_ingclass.yaml
 apiVersion: elbv2.k8s.aws/v1beta1
 kind: IngressClassParams
 metadata:
  labels:
    app.kubernetes.io/name: aws-load-balancer-controller
-  name: alb 
+  name: alb
 ---
 apiVersion: networking.k8s.io/v1
 kind: IngressClass
@ -1170,7 +1171,6 @@ spec:
    name: alb
 ---
 apiVersion: policy/v1
-
 kind: PodDisruptionBudget
 metadata:
  name: aws-load-balancer-controller