Merge pull request #18221 from hakman/aws-lbc-3.2.2

aws: update LBC to v3.2.2 via helm+kustomize

Author: k8s-ci-robot

cmd/kops/integration_test.go

@@ -851,7 +851,7 @@ func TestAWSLBController(t *testing.T) {
 		withServiceAccountRole("aws-cloud-controller-manager.kube-system", true).
 		withServiceAccountRole("aws-node-termination-handler.kube-system", true).
 		withServiceAccountRole("ebs-csi-controller-sa.kube-system", true).
-		withAddons("aws-load-balancer-controller.addons.k8s.io-k8s-1.19",
+		withAddons("aws-load-balancer-controller.addons.k8s.io-k8s-1.19-irsa",
 			"certmanager.io-k8s-1.16",
 			awsEBSCSIAddon,
 			dnsControllerAddon,
@@ -888,7 +888,7 @@ func TestManyAddonsCCMIRSA(t *testing.T) {
 		withServiceAccountRole("ebs-csi-controller-sa.kube-system", true).
 		withAddons(
 			"aws-ebs-csi-driver.addons.k8s.io-k8s-1.17",
-			"aws-load-balancer-controller.addons.k8s.io-k8s-1.19",
+			"aws-load-balancer-controller.addons.k8s.io-k8s-1.19-irsa",
 			"certmanager.io-k8s-1.16",
 			"cluster-autoscaler.addons.k8s.io-k8s-1.15",
 			"networking.amazon-vpc-routed-eni-k8s-1.16",

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-irsa_content

@@ -143,9 +143,9 @@ spec:
     selector:
       k8s-addon: node-termination-handler.aws
     version: 9.99.0
-  - id: k8s-1.19
-    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: b295d8da3d0e86937fd8a0a86c93db40bbeac296fb723849a65575b2adf9021f
+  - id: k8s-1.19-irsa
+    manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19-irsa.yaml
+    manifestHash: 985bbe03988009bb6b25d153bf8ab44b3a71f100c9628c98d4114d94bcdb424b
     name: aws-load-balancer-controller.addons.k8s.io
     needsPKI: true
     selector:

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

@@ -853,10 +853,10 @@ resource "aws_s3_object" "minimal-example-com-addons-aws-ebs-csi-driver-addons-k
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_object" "minimal-example-com-addons-aws-load-balancer-controller-addons-k8s-io-k8s-1-19" {
+resource "aws_s3_object" "minimal-example-com-addons-aws-load-balancer-controller-addons-k8s-io-k8s-1-19-irsa" {
   bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content")
-  key                    = "clusters.example.com/minimal.example.com/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml"
+  content                = file("${path.module}/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19-irsa_content")
+  key                    = "clusters.example.com/minimal.example.com/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19-irsa.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }