Merge pull request #14178 from olemarkus/bump-lbc-125

Bump AWS Load Balancer Controller to v2.4.3
2022-08-24 23:04:04 -07:00 · 2022-08-24 23:04:04 -07:00 · 6c297f9638
parent fa377131b2 1b5e90fa18
commit 6c297f9638
17 changed files with 17 additions and 17 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
@ -894,7 +894,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: amazon/aws-alb-ingress-controller:v2.4.1
+        image: amazon/aws-alb-ingress-controller:v2.4.3
        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
@ -47,7 +47,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 53900ac7a260b5d7164a9b8b049de8ac4136041bdd12de253abf9bf0cfa8ef40
+    manifestHash: f3e44a9cd8ba1650b8dbebf5507d01e5c833d646d0c34ef099c052f7b379e072
    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
@ -894,7 +894,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: amazon/aws-alb-ingress-controller:v2.4.1
+        image: amazon/aws-alb-ingress-controller:v2.4.3
        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
@ -97,7 +97,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 53900ac7a260b5d7164a9b8b049de8ac4136041bdd12de253abf9bf0cfa8ef40
+    manifestHash: f3e44a9cd8ba1650b8dbebf5507d01e5c833d646d0c34ef099c052f7b379e072
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/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-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -894,7 +894,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: amazon/aws-alb-ingress-controller:v2.4.1
+        image: amazon/aws-alb-ingress-controller:v2.4.3
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -104,7 +104,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 7989476c17298273dd651e8e1fbe699ca2783070b5d92a21458a04b638afd45a
+    manifestHash: 0c048675f400abb6108ed571576574a4f4138a70ee0917dcfc980764172a03d1
    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
@ -894,7 +894,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: amazon/aws-alb-ingress-controller:v2.4.1
+        image: amazon/aws-alb-ingress-controller:v2.4.3
        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
@ -104,7 +104,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 7989476c17298273dd651e8e1fbe699ca2783070b5d92a21458a04b638afd45a
+    manifestHash: 0c048675f400abb6108ed571576574a4f4138a70ee0917dcfc980764172a03d1
    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
@ -894,7 +894,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: amazon/aws-alb-ingress-controller:v2.4.1
+        image: amazon/aws-alb-ingress-controller:v2.4.3
        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
@ -104,7 +104,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 7989476c17298273dd651e8e1fbe699ca2783070b5d92a21458a04b638afd45a
+    manifestHash: 0c048675f400abb6108ed571576574a4f4138a70ee0917dcfc980764172a03d1
    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
@ -894,7 +894,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: amazon/aws-alb-ingress-controller:v2.4.1
+        image: amazon/aws-alb-ingress-controller:v2.4.3
        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
@ -97,7 +97,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 7989476c17298273dd651e8e1fbe699ca2783070b5d92a21458a04b638afd45a
+    manifestHash: 0c048675f400abb6108ed571576574a4f4138a70ee0917dcfc980764172a03d1
    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
@ -889,7 +889,7 @@ spec:
        - --ingress-class=alb
        - --default-tags=KubernetesCluster=minimal.example.com
        - --aws-region=us-test-1
-        image: amazon/aws-alb-ingress-controller:v2.4.1
+        image: amazon/aws-alb-ingress-controller:v2.4.3
        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
@ -97,7 +97,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 143408ef1b6a64613e8fc531344549a94f01f505ff0d4851e79ac1037c6d1597
+    manifestHash: 5b35b6eba1236bd63720efb533b04bad96eba1c7cb9f1289653a9738b3a2f5e1
    name: aws-load-balancer-controller.addons.k8s.io
    needsPKI: true
    selector:
--- a/tests/integration/update_cluster/many-addons/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/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@ -889,7 +889,7 @@ spec:
        - --ingress-class=alb
        - --default-tags=KubernetesCluster=minimal.example.com
        - --aws-region=us-test-1
-        image: amazon/aws-alb-ingress-controller:v2.4.1
+        image: amazon/aws-alb-ingress-controller:v2.4.3
        livenessProbe:
          failureThreshold: 2
          httpGet:
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@ -97,7 +97,7 @@ spec:
    version: 9.99.0
  - id: k8s-1.19
    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 143408ef1b6a64613e8fc531344549a94f01f505ff0d4851e79ac1037c6d1597
+    manifestHash: 5b35b6eba1236bd63720efb533b04bad96eba1c7cb9f1289653a9738b3a2f5e1
    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
@ -748,7 +748,7 @@ spec:
        - --ingress-class=alb
        - "--default-tags={{ CloudLabels }}"
        - --aws-region={{ Region }}
-        image: amazon/aws-alb-ingress-controller:{{ or .AWSLoadBalancerController.Version "v2.4.1" }}
+        image: amazon/aws-alb-ingress-controller:{{ or .AWSLoadBalancerController.Version "v2.4.3" }}
        livenessProbe:
          failureThreshold: 2
          httpGet: