From 2897962db969046b6e5e988c8556b871f55e68c1 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Fri, 29 Nov 2024 21:00:40 -0600 Subject: [PATCH 1/2] Use port 9811 for EBS CSI controller healthcheck --- .../aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template index 7f00cab4fcd3a..20a58660eabf3 100644 --- a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template +++ b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template @@ -741,7 +741,7 @@ spec: mountPath: /var/lib/csi/sockets/pluginproxy/ ports: - name: healthz - containerPort: 9809 + containerPort: 9811 protocol: TCP - name: metrics containerPort: 3301 @@ -932,7 +932,7 @@ spec: imagePullPolicy: IfNotPresent args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 volumeMounts: - name: socket-dir mountPath: /csi From 88eded9ae9d2d4e5d114ba607763c7b554df8722 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Fri, 29 Nov 2024 21:01:14 -0600 Subject: [PATCH 2/2] ./hack/update-expected.sh --- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ect_additionalobjects.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...bject_bastionuserdata.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ority-expander-custom.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...cas-priority-expander.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_complex.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ws_s3_object_compress.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._s3_object_containerd.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._s3_object_containerd.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- .../aws_s3_object_123.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_existing-iam.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._s3_object_existingsg.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._s3_object_externallb.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ject_externalpolicies.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- .../aws_s3_object_ha.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...s3_object_many-addons.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...s3_object_minimal-aws.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_minimal-etcd.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ....cluster-name.minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ject_minimal-warmpool.example.com-addons-bootstrap_content | 2 +- ...l-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- .../aws_s3_object_minimal.k8s.local-addons-bootstrap_content | 2 +- ...l-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- .../aws_s3_object_minimal.k8s.local-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...object_mixedinstances.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...object_mixedinstances.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...essor.longclustername.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...essor.longclustername.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ect_private-shared-ip.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...private-shared-subnet.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._object_privatecalico.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_privatecanal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._object_privatecilium.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._object_privatecilium.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._object_privatecilium.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...privateciliumadvanced.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...s3_object_privatedns1.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...s3_object_privatedns2.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...object_privateflannel.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ..._object_privatekopeio.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_sharedsubnet.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...s_s3_object_sharedvpc.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...3_object_minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...s_s3_object_unmanaged.example.com-addons-bootstrap_content | 2 +- ...m-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- .../amazonvpc-containerd/manifest.yaml | 2 +- .../tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml | 2 +- .../bootstrapchannelbuilder/awscloudcontroller/manifest.yaml | 2 +- .../awsiamauthenticator/crd/manifest.yaml | 2 +- .../awsiamauthenticator/mappings/manifest.yaml | 2 +- .../tests/bootstrapchannelbuilder/cilium/manifest.yaml | 2 +- .../tests/bootstrapchannelbuilder/coredns/manifest.yaml | 2 +- .../metrics-server/insecure-1.19/manifest.yaml | 2 +- .../metrics-server/secure-1.19/manifest.yaml | 2 +- .../bootstrapchannelbuilder/service-account-iam/manifest.yaml | 2 +- .../tests/bootstrapchannelbuilder/simple/manifest.yaml | 2 +- 143 files changed, 209 insertions(+), 209 deletions(-) diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 226be9a4eda4e..c4e81629f3d3a 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content index 985a031e63277..579b7d565d1d6 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: a5b98b0e1567802e86a0acdf40915643d41f06db609e2f66a702b0cb3e2deb5f + manifestHash: ab4a6f82af9ce89cfc4458d0da29e42b2fbe13b5be0515af0f27dd1256bb7b56 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b0c3eaf3f5a08..b7f5d8a7ce52e 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 64f238dc69cbd..96242f5b7008c 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1084,7 +1084,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com diff --git 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 index ffd506ea89db5..e49c845d2a093 100644 --- 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 @@ -170,7 +170,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 708673cced95a78d0fe1558035c0ecf42831c03909f5a5c87260b9a3152ba812 + manifestHash: 3b0df2d544873a0453d87b9a197830fba310cb73cbd09f367fad7db6161e9e34 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index e26494e27a7c9..f6a80a0ab6773 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content index 8fb32f1f9e8c3..d120a27e97764 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 29e5d90b768b96358405830bfddefcbeb5021a5f61a9f5d7337a3ca9958c4e43 + manifestHash: 175814ab70587812d227ab0fa84fea60598ca86bbb1b6b916132dcf9558bdedc name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 12fdf19c46890..ea67099bab6ec 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content index 35f0ed7194d95..953a2505355c4 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 39cef94908b236f6655a56e658a5c8ce7482e02a8f467f12889798838b7d9997 + manifestHash: 618a57463c43b385b746a8d9cfa66606143d675750baa52e587e442785f3d77d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 83f600e3fdca8..1176258530113 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content index 5cfe9007eff98..d2697e86fe107 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 67fe4767a73c3d6991847705e6a4e108b845598a4e866b9c54a43cdd18ea6680 + manifestHash: 916c40c65c8dd2498d7976c60a90f86812ae553164515bd151ffe4462f9dbe42 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index b023c811e2863..0b12c52576563 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content index 17335c4a60bd0..9ef0bd0195fa1 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 17fd795c56753c4281d8df073380a638403e4aee10fd68dada5c356bf9488264 + manifestHash: bfc948340e56cecb10d825d217ee9b614a9fdb37c54d9dde7eef6177fc04dccd name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 1866bc866af5c..6004da6860b06 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content index 0b8326ae1a8ac..8260fc0cf9dba 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 698ef91047a24ebef2e35f01dc5da5cb8e0c066c956b7bc3da03b8b1b0916d34 + manifestHash: 69447c3e0d8cfe291773dfa3baeae28731448de5b6b236b0deb9b1144bc4b845 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c7b556368de5f..ac04088483a10 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content index 79765b4774918..f6e9afcacbc11 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: b32426417f7de6a078379f6552c9c3a07a196f62a9b5452bafd8d0d476abe14a + manifestHash: fc81153cec28c58bb1db488b9f8d683591d660eaff2c7075f018c963e21a4bda name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c7b556368de5f..ac04088483a10 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content index 79765b4774918..f6e9afcacbc11 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: b32426417f7de6a078379f6552c9c3a07a196f62a9b5452bafd8d0d476abe14a + manifestHash: fc81153cec28c58bb1db488b9f8d683591d660eaff2c7075f018c963e21a4bda name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 1dbce8fa822e7..cf4b1e0069ab9 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content index 3f3621684c026..4052d349dc0a6 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 4c9851cc0526e3121d831d8bdd93b40a84492b409f39e736baf902cfd49097c7 + manifestHash: d10948a715a668965ad7e82fdebf5541188b2407493f2d7efb72da48224badb8 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 75e2267046f19..546fe24f4d8cc 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content index e6a47be5924b0..0d4e1662b5f4d 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 5b97f53fb8cad34434eb9dd2c7b280c2e7d8e339dfeeaa9e146870bdfc9d9fe5 + manifestHash: 6174190a8dbb2f3efcb49a4cb99504f5b328d179b1a7970e89d1650fc2b5da86 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 7fb3c09ba5ca0..73e86be8e9cc0 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content index c2bbf10564c01..1d3e9e17e86de 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 89800bddb7b4cd673ccbb612a77c55ac8e41b5c84717adb634e42372c11384c4 + manifestHash: e7c3df47bf5ff90f86348c6598fb84ea03bc94719bb0adaa123e72807ee3ac5e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 319d6b8e82b7b..b7f1b9f1a32fd 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 64f238dc69cbd..96242f5b7008c 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1084,7 +1084,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 5fbf9ce147571..5b8ffcb03a932 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 708673cced95a78d0fe1558035c0ecf42831c03909f5a5c87260b9a3152ba812 + manifestHash: 3b0df2d544873a0453d87b9a197830fba310cb73cbd09f367fad7db6161e9e34 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index afbd3a393ae48..59ab28c43110a 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content index 995f821792537..73f9fcc7935f4 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: e12a90cfe11908aa8d48fb27562bf6242a3d13c1c7ade14304f43bcba73ceb74 + manifestHash: 6862502b85afabd105ca745cd708a50aafd455e9e24a5f58d6cb5320d54fcf61 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 64bb478f96ac1..e57390dc0bd4d 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content index cf06517d9caad..c50e97ee34cc4 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3c639d6da7104f5e9f8d7b7eebb2e19b7d5b325447353f4eae05dae57592da7f + manifestHash: 8c4a375af16a025bbfa0a8585e2f88f62ac76c4c580a86b001fe678de5be6125 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 9494e89bb7d80..d8e8d991da07f 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content index b38cbcfa420e0..133e4c1fe774a 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 980c8d8add4062a91bfe4c3f22af939a7c501c99e7ab6ede5b047fc1ede6178a + manifestHash: ac43c73942f638aa93329a3448ace0139d6ca40318addf6e555f3f6cc9bb0e67 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 1c648601a6225..e2a0f0cd0986e 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -170,7 +170,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 64f238dc69cbd..96242f5b7008c 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1084,7 +1084,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index db0626b0c3492..c352b177d69cf 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 708673cced95a78d0fe1558035c0ecf42831c03909f5a5c87260b9a3152ba812 + manifestHash: 3b0df2d544873a0453d87b9a197830fba310cb73cbd09f367fad7db6161e9e34 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index bb19a86929309..f5f3572927925 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1121,7 +1121,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com diff --git 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 index 0d8eec309fa0f..ddb19a613bd73 100644 --- 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 @@ -193,7 +193,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 1eb869764e6c608a046d589638dc389913c5a3428fb4ecdda7626b91550343d2 + manifestHash: db7ca215ecd9c12f6f746b37865600f8130ef9844faf7bad48ba8e661fd83ee7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index bb19a86929309..f5f3572927925 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1121,7 +1121,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com diff --git 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 index 3d725dfaeaa45..5834aa4a0ce42 100644 --- 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 @@ -200,7 +200,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 1eb869764e6c608a046d589638dc389913c5a3428fb4ecdda7626b91550343d2 + manifestHash: db7ca215ecd9c12f6f746b37865600f8130ef9844faf7bad48ba8e661fd83ee7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index bb19a86929309..f5f3572927925 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1121,7 +1121,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com diff --git 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 index bb1fafeb698ef..400eba21403f8 100644 --- 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 @@ -201,7 +201,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 1eb869764e6c608a046d589638dc389913c5a3428fb4ecdda7626b91550343d2 + manifestHash: db7ca215ecd9c12f6f746b37865600f8130ef9844faf7bad48ba8e661fd83ee7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index acf91c544c1bb..326e6cbdf2204 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -899,7 +899,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1081,7 +1081,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git 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 index 5d442c1a13973..4b2f37fec7adf 100644 --- 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 @@ -193,7 +193,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 0cbdc7b57eccbde1cab112d2184c9503e1c955dec3e7fb9d3053f4ebbf385ed9 + manifestHash: b9cc46ce67bb8b7d3a0524b892ee74363af29d4f3cd81d3dc9c95dcc1c1e32d2 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 97eb78f3a8dc1..71d9f6ce48cac 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1083,7 +1083,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git 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 index 3ff52c2dc7fd0..88367547a0194 100644 --- 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 @@ -242,7 +242,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 9f986096669cb8c9a14f04bb6010506bea9cc81f1816b3549142e19b257e7013 + manifestHash: 93f2cbab89b3a139165fd128ca4f247bf13bd000e65fe7c876702dd4670ad6b7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 0cd5f6d692618..02d5588fe9cb7 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index edd2932290bf2..d9756858a6330 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 1c6e07f3a5f88..07572b48f6eff 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 806bc4fe267fa..9bdb87b340b7a 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index cae5cead91890..5911afd91dbee 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 31e059d812d16..e8b0c339a8d37 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 36a52374057e7..0479fa415dc2f 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content index 4ac5ec3149d36..0e19b710503ed 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ba71cbde24af4ef7fe7b2a96feb2839112780e3f89586e527c2cc98d54197c65 + manifestHash: acddf456ba0164b8d109efaade70478d2da76f72966d61ba55113503fede2f93 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 8d96389f4bb57..8317095de4c81 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -99,7 +99,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 217dcf60c87c2..ce4c9a3fd5e54 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content index 8b4e138658281..b4723a6a30379 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 6afb32b6f5ae929c5ec0d47ee7d3d4946d3987918cd648c03147dd08d3dc5933 + manifestHash: 5fc43105ee9423944095c1da90ccdd3429355d8c4de4326d0ff7124e4ef196a7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 9739b4deee781..d69f690ccda5c 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c4727300fc9a9..b2dc3d859b277 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -905,7 +905,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1057,7 +1057,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 799a52a48ccb7..2671ae8a67af1 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -168,7 +168,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: de399ffc1c8a0803fd4442d1b4705af05063a459e6dab503cc0798eaa334dcb5 + manifestHash: 02ffc898b0f441a3757cdbe800f27e6adfdf67c062f1d1dd701e81ccec879a25 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c4727300fc9a9..b2dc3d859b277 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -905,7 +905,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1057,7 +1057,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index cec5398e5cd3b..1da0c45543c6e 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -121,7 +121,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: de399ffc1c8a0803fd4442d1b4705af05063a459e6dab503cc0798eaa334dcb5 + manifestHash: 02ffc898b0f441a3757cdbe800f27e6adfdf67c062f1d1dd701e81ccec879a25 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c4727300fc9a9..b2dc3d859b277 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -905,7 +905,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1057,7 +1057,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 73ade573e797d..f3abd1a415dcb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: de399ffc1c8a0803fd4442d1b4705af05063a459e6dab503cc0798eaa334dcb5 + manifestHash: 02ffc898b0f441a3757cdbe800f27e6adfdf67c062f1d1dd701e81ccec879a25 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c4727300fc9a9..b2dc3d859b277 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -905,7 +905,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1057,7 +1057,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 73ade573e797d..f3abd1a415dcb 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: de399ffc1c8a0803fd4442d1b4705af05063a459e6dab503cc0798eaa334dcb5 + manifestHash: 02ffc898b0f441a3757cdbe800f27e6adfdf67c062f1d1dd701e81ccec879a25 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 20d035525b4e0..5f888d4bdde42 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content index 69d4e2393a87d..b772002dc0189 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 2c037fd0dfcb4aab796bbbfd935b6cd766d1dd686547dfdd2fc6027669ee6769 + manifestHash: 32694ed7b6bad6047e5f82e037c71f0d2ef1da116e5f778a150fec0b1fdae044 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index a327399dc4133..848707fe3a1e3 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content index 7a884d3429fd2..0c89fd566e330 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 645d0938afbc9bc8cf14fb4ce2565b90eaa524046159d9090b883fc1582e1911 + manifestHash: d7631bc37a7ff85109c478b3657f4f37ab6973757fa25cc5da34686ee863e956 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 4015eac733ecf..f9584f7e45f00 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content index 94631554a70c2..e0f853b8575fa 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3bf6d5159feb604c7ac48508480b18040762b12db35af0075d2f1bee87807a10 + manifestHash: e87584bab5b76e6acd04df7897ba77ce3e1a1bca885a3bae5769b3d566afe544 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index bd0939686c033..03d158f490def 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1084,7 +1084,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.k8s.local diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content index fda08c87ff414..4dee3fd99a48d 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: a3ff813d36b15f0697c8d6454e7e075895c9ac6e3f931f1a819a57a48fd5e3b2 + manifestHash: 4b03c78c6dd4e2eb383102d7a212de1725971d2fa0d22326ac31feedea01110e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0d3297b8c334e..39dfadcebc786 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content index dc61e0fc67c06..0dc17653d6d4d 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 953f7b54d0da96a955523210aac7151fd102447835de175a9dcc4e8f089e011a + manifestHash: 791d8f8f03c1937ad4bcae6574628da5811461ac170ac22da3e915129256022e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0d3297b8c334e..39dfadcebc786 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content index dc61e0fc67c06..0dc17653d6d4d 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 953f7b54d0da96a955523210aac7151fd102447835de175a9dcc4e8f089e011a + manifestHash: 791d8f8f03c1937ad4bcae6574628da5811461ac170ac22da3e915129256022e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index cc5530a76344d..e9a44df01cfa7 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1084,7 +1084,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.nthimdsprocessor.lon-kfj86l diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content index 6cdb8e4a1a32e..7b323fc9ca35a 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content @@ -104,7 +104,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 53653dcc2ad09dbf1199f011770b821b7a0c8d08996b777c8da5fe5db7281252 + manifestHash: 89d9d1b576ddca58a20420074ddef2671101c266c1dd599a719f1b91751cab5c name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index cef5888287cec..7e127db1e93fa 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content index 158655c5386f5..c62021cf5d1ae 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content @@ -104,7 +104,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 6e38957d9f0df9e7ed6816d74f32644ba1744c099a9c7982f3489afddc5a4de0 + manifestHash: 70b99058533de3424acc9ebcd3e0f215730aff3a84e83ffdefecfe9c7bb8ff1a name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 0cdfd93e90490..1b997081070cf 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 5b2c57000cc65..443ac78cb9a2a 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content index bf839db5ee47e..8f9cb6e8daef3 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: cb9d61e31f16c05f718131aa2408c68aef2fa4956feb02c71b2ba7569a27e3d1 + manifestHash: fe34112d96ebbff0f4d5e9d202bdcddfa34597f8450effba588347b9df7cd969 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22c78b25aa2ca..8638b089b020d 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content index 01ec5534650e0..6bceb44e0b50f 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 0826603ac19bf719905db750280d18aaa28436da3227d92d1f873520622e415c + manifestHash: 62ca293e3cd716f4279a08a381774eafd226b153e23760e615bfec381d17a8c9 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 7d049283b1901..96408c26f4742 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content index 7f0d2ea1d8819..3d8381286198f 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content @@ -168,7 +168,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 9c8a762c8db5c82dd367c5d7de0d90e11216fe86a1d1069171bb7a3423e6c694 + manifestHash: f1db751f65db1e5cfe3d76d46f646e0e220172e84e4d0f455c68a8d4c1e46b4d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 5b98e88f7d8ea..5c1234a1b3936 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content index 3a1a72607d1a3..37b41d733781f 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content @@ -168,7 +168,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: edcb2f66a69b7da34dffc8a35412ba1106874eb601ab2748cc2dd570af833908 + manifestHash: 5af73c8411274677331a01fb932e654bd3a0a71338b560a670cf70f6bcc75d2d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index e1e2df615f159..22a31771b6bd0 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index ce2808cd1dc98..ee4d9f4c927d1 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 01ab3de240821688dd1532a496334dab16aa483386a38d1fbc8bc48776cfe847 + manifestHash: de80c082290dfe44e460395ca008e78da25cb18ee75d8877757c5cdb55421de8 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index e1e2df615f159..22a31771b6bd0 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index 8900b782e8206..3173712b8c7e3 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 01ab3de240821688dd1532a496334dab16aa483386a38d1fbc8bc48776cfe847 + manifestHash: de80c082290dfe44e460395ca008e78da25cb18ee75d8877757c5cdb55421de8 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index e1e2df615f159..22a31771b6bd0 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index cdd90bd314fa5..34b388cad048d 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -171,7 +171,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 01ab3de240821688dd1532a496334dab16aa483386a38d1fbc8bc48776cfe847 + manifestHash: de80c082290dfe44e460395ca008e78da25cb18ee75d8877757c5cdb55421de8 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index e4c6f358ca05b..3d60ef8cb1e55 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content index 816ba7fa01669..fdfcff995be8f 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 86bf1571fc243e7e79260d743e58a558cd8b0957fdb48446b5783380e9ca27fa + manifestHash: 87a215fe67d46da80e2b7879af91b5f87ddf3bba66df7fa691cab52a93832d34 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 80b3ec15fd2f7..ee262ab9c20ce 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content index f4a5e2ecaf2de..b014447759b39 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 7d0ccca0efb757cc1c8d68b84a5f44cf5eed10e12bbdf42b01282d7ce5469dc0 + manifestHash: 459d8da90b163c654ba80ce7801f9c106844104944546f2f5bf92d0b23eead8a name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 4e42a285a4ed3..ce50b3c4240be 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content index 09c080d8e938a..92238efc05a42 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 583aea94faa01c10272612ab369b9219735f2cb574602ad412e18ffbbe88d652 + manifestHash: 121a89c29264b3e86637992a3bf1978fcf71dc2ba2034dd47210469de094ac34 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 7654090d15be8..ef9b3289e0c03 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content index f6d4c7896a255..f7e63842e59c6 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content @@ -164,7 +164,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 4d52310b3dcd33d3d4352d73aa74fff240dc5e41f1f073a6d776e014d506cd0e + manifestHash: f3ee02c9da6a3bcfa419cd8e5813e8a91a3bdc817d9c32057ea606e4dc948ba0 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index e5fa95d474b0b..0f81c8f3d1d60 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content index ba09a56ba1ad6..70f02dfdb9a8b 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content @@ -155,7 +155,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 7f015e0639c893075697428d2a3e8bf0bb62f5260a950e8cc3cd33bc013312ce + manifestHash: ef35355c967fec6ada5ace915b4f8dba46d8ec727f714500db212ef386fc9fc7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 64f238dc69cbd..96242f5b7008c 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1084,7 +1084,7 @@ spec: readOnly: true - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 env: - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 06f3418624dfc..df2035b52de31 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 708673cced95a78d0fe1558035c0ecf42831c03909f5a5c87260b9a3152ba812 + manifestHash: 3b0df2d544873a0453d87b9a197830fba310cb73cbd09f367fad7db6161e9e34 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 4032b683e8fae..02c3126bb2f25 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content index 2baeb56d4d218..07d4c31a11176 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 4cdc734018ea4d96008b291c9f8b66b1dfe829a5ea9e8cc74f919b6d9ffa4f69 + manifestHash: a4c1293fa13cc21464ab2771a0ade73ce26851a70fc6b9dd236018412e13ca03 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index fa1e80ac59b3c..fb69df3bd49d7 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content index c5c5f5ddcd98f..28a593980d11a 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: b9438dd3596adb168f5a439f47267f1264eab7a98311a89b18fc6d74525a909d + manifestHash: 1c08c5e9b5b550d6d1f3ecd95922ba9bdc58d6fcd1a3a34f7d7799ffb5acca89 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c4727300fc9a9..b2dc3d859b277 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -905,7 +905,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1057,7 +1057,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 73ade573e797d..f3abd1a415dcb 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: de399ffc1c8a0803fd4442d1b4705af05063a459e6dab503cc0798eaa334dcb5 + manifestHash: 02ffc898b0f441a3757cdbe800f27e6adfdf67c062f1d1dd701e81ccec879a25 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 351b88d4563a1..642fca31d9bd8 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content index f6cd2ef85e771..88f7f43061bda 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 2957291e9d3919cb7b29396979eb46cbcf857f6e24aa5b38951fa82d3cdcad4d + manifestHash: 724c31fcb29937168fdd2c49227862f123dbc35948fdb2f56d8850d732ce1bb1 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 609957aa3f427..40228d7670217 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -901,7 +901,7 @@ spec: timeoutSeconds: 3 name: ebs-plugin ports: - - containerPort: 9809 + - containerPort: 9811 name: healthz protocol: TCP - containerPort: 3301 @@ -1053,7 +1053,7 @@ spec: name: socket-dir - args: - --csi-address=/csi/csi.sock - - --http-endpoint=0.0.0.0:9809 + - --http-endpoint=0.0.0.0:9811 image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.13.0-eks-1-30-10 imagePullPolicy: IfNotPresent name: liveness-probe diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 9739b4deee781..d69f690ccda5c 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bb202a8404fe78c6ef294b7e7f83a634588927ed1ad640d23c4798eece1cb974 + manifestHash: 22e3d94070e9b480315c0163479741d8c6b55005252539f486d2dceb1a284c8e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index ad5b48905c9da..c6abb090d20c6 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index ad5b48905c9da..c6abb090d20c6 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 6d27bdd997520..2ca3dd174cd9c 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml index 4279d58a0435f..a467aad368bc1 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml index f855f0f98221f..86d8aa7b79e2b 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 00ee8dafbec98..266b439a1e745 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml index 94a1056e199a4..0745b85dbf4d7 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml index b890c947e88af..f156aaae4d99c 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml @@ -128,7 +128,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml index 2ebc65cd31792..4bb57bb5ceac2 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml @@ -185,7 +185,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml index 20593c44b1c96..779b39fe88d56 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: d66a2070ecc72f8b94394d8ce7dc6f7165ec57ab65d8b82146391478e4ea02e3 + manifestHash: 4523b7420e3052613c98e961299af12e014c2c87542c6aefaf4849d53cb3471e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index c3266a75c13fb..9d6b29c5da409 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 585002a966cf0bf4342a1dcc5faf909d1694fcb500fad30634f0ae0c7a3c9464 + manifestHash: 67176b6289a3c37979877436fe221b2420889b6bc0e63506013ea297a64215ed name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io