From ab3e67d9ed539033538351d2d028b468c7cbb192 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 21 Nov 2021 11:17:40 +0200 Subject: [PATCH] Update IPv6 settings for AWS EBS CSI driver --- .../create_cluster/ipv6/expected-v1alpha2.yaml | 3 +++ ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...ject_minimal.example.com-addons-bootstrap_content | 2 +- ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 10 ++++++++-- ...minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 10 ++++++++-- ...minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 10 ++++++++-- ...minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 10 ++++++++-- ...minimal-ipv6.example.com-addons-bootstrap_content | 2 +- ...late_nodes.minimal-warmpool.example.com_user_data | 2 +- ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...mal-warmpool.example.com-addons-bootstrap_content | 2 +- .../aws_s3_bucket_object_nodeupconfig-nodes_content | 1 - ...aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content | 4 ++-- ...privatecanal.example.com-addons-bootstrap_content | 2 +- .../k8s-1.17.yaml.template | 12 ++++++++++-- upup/pkg/fi/cloudup/new_cluster.go | 6 ++++++ .../awscloudcontroller/manifest.yaml | 2 +- 26 files changed, 75 insertions(+), 35 deletions(-) diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml index b62c91b66e57c..fbb6386ceac1c 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -9,6 +9,9 @@ spec: authorization: rbac: {} channel: stable + cloudConfig: + awsEBSCSIDriver: + enabled: true cloudControllerManager: {} cloudProvider: aws configBase: memfs://tests/ipv6.example.com diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index cc35089c83940..12f51e9459ddb 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -648,7 +648,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index dd76adedf2940..b4ae0f58208a8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -133,7 +133,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ab6e7bdfe63fd878acd739297ae675d839f81e316064a4bd1beaee671ed34e76 + manifestHash: 1b755a4654c486d41681bf71dff7fabc386a588707a31e9895ba53967c69ef2e 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_bucket_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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0512d1df2ec85..d7f90adff1f68 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -644,7 +644,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index e09b5d216b2c5..91c338866cde5 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -133,7 +133,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 55205b3ca13a56f46c4028c33cd926dd8e73d6c3fcef7c22386d3924f9806824 + manifestHash: fbe5890e42125b25e4b7e968fd874ddafc1ec48d792892ea118ccb7c476f8050 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_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0512d1df2ec85..d7f90adff1f68 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -644,7 +644,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 61d09b5e29734..91534372b9d02 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -126,7 +126,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 55205b3ca13a56f46c4028c33cd926dd8e73d6c3fcef7c22386d3924f9806824 + manifestHash: fbe5890e42125b25e4b7e968fd874ddafc1ec48d792892ea118ccb7c476f8050 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.23/data/aws_s3_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0512d1df2ec85..d7f90adff1f68 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -644,7 +644,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 3af8087f1745e..6faa9ae46d38d 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 55205b3ca13a56f46c4028c33cd926dd8e73d6c3fcef7c22386d3924f9806824 + manifestHash: fbe5890e42125b25e4b7e968fd874ddafc1ec48d792892ea118ccb7c476f8050 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_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index ffc90307da7fb..9bb12f39a20ed 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -482,6 +482,10 @@ spec: - --logtostderr - --v=2 env: + - name: AWS_EC2_ENDPOINT + value: https://api.ec2.us-test-1.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 - name: CSI_ENDPOINT @@ -490,7 +494,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -629,6 +633,8 @@ spec: env: - name: AWS_EC2_ENDPOINT value: https://api.ec2.us-test-1.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 - name: CSI_NODE_NAME @@ -650,7 +656,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index 35041c6e2de06..bbbafa68de37d 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -68,7 +68,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 89dd2acfaa55cfd70b38c74ce633d96b59e27df5a27dba2d6880ffcb68437235 + manifestHash: d7f43bb6e6312e13e0a2eb669c7c9f924e53bbefab6ade9662708f06db402490 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_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index ffc90307da7fb..9bb12f39a20ed 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -482,6 +482,10 @@ spec: - --logtostderr - --v=2 env: + - name: AWS_EC2_ENDPOINT + value: https://api.ec2.us-test-1.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 - name: CSI_ENDPOINT @@ -490,7 +494,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -629,6 +633,8 @@ spec: env: - name: AWS_EC2_ENDPOINT value: https://api.ec2.us-test-1.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 - name: CSI_NODE_NAME @@ -650,7 +656,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index c5f3b13576c3c..417f486c119a7 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -69,7 +69,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 89dd2acfaa55cfd70b38c74ce633d96b59e27df5a27dba2d6880ffcb68437235 + manifestHash: d7f43bb6e6312e13e0a2eb669c7c9f924e53bbefab6ade9662708f06db402490 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-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index ffc90307da7fb..9bb12f39a20ed 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -482,6 +482,10 @@ spec: - --logtostderr - --v=2 env: + - name: AWS_EC2_ENDPOINT + value: https://api.ec2.us-test-1.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 - name: CSI_ENDPOINT @@ -490,7 +494,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -629,6 +633,8 @@ spec: env: - name: AWS_EC2_ENDPOINT value: https://api.ec2.us-test-1.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 - name: CSI_NODE_NAME @@ -650,7 +656,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index 36ca77f49df4e..be6f02fd4e1c2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -61,7 +61,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 89dd2acfaa55cfd70b38c74ce633d96b59e27df5a27dba2d6880ffcb68437235 + manifestHash: d7f43bb6e6312e13e0a2eb669c7c9f924e53bbefab6ade9662708f06db402490 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_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index ffc90307da7fb..9bb12f39a20ed 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_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_bucket_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -482,6 +482,10 @@ spec: - --logtostderr - --v=2 env: + - name: AWS_EC2_ENDPOINT + value: https://api.ec2.us-test-1.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 - name: CSI_ENDPOINT @@ -490,7 +494,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -629,6 +633,8 @@ spec: env: - name: AWS_EC2_ENDPOINT value: https://api.ec2.us-test-1.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 - name: CSI_NODE_NAME @@ -650,7 +656,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index 36ca77f49df4e..be6f02fd4e1c2 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -61,7 +61,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 89dd2acfaa55cfd70b38c74ce633d96b59e27df5a27dba2d6880ffcb68437235 + manifestHash: d7f43bb6e6312e13e0a2eb669c7c9f924e53bbefab6ade9662708f06db402490 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_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index 4dc117e2bbb8e..5aa0b94249dfd 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data @@ -166,7 +166,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: XPOVEdCrpSkrDxiJQoaIOeH8Ec/7oqGiNlEb+7iDEvE= +NodeupConfigHash: 0uhoVbCNpQvmklV68BI8shZaW6RlulRYw3gygeGoOuM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_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_bucket_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index a5ea34f43a62b..2ad67159434f8 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_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_bucket_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -644,7 +644,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content index 5ae303f78d7c0..51472266dea36 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content @@ -62,7 +62,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3e1b0ca16339aa448c350fe69a302eecc38b58c2a3d4466395f18f4a3e8dad68 + manifestHash: 00320af50d39504ef2edafccefaebfbe900a96edb77b9c5578527ff44dde608c 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_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 76d839b24ff55..74cd90c1418a4 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -67,7 +67,6 @@ containerdConfig: version: 1.4.12 warmPoolImages: - k8s.gcr.io/kube-proxy:v1.21.0 -- k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 - k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 - k8s.gcr.io/sig-storage/livenessprobe:v2.2.0 - quay.io/cilium/cilium:v1.10.4 diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_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_bucket_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 4cf71bedd15e4..102d8925bf21e 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_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_bucket_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 livenessProbe: failureThreshold: 5 httpGet: @@ -644,7 +644,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content index 30f23b1a5573d..03462efdf6ff9 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content @@ -61,7 +61,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: dd8a6632d53821b6fc49ad83d524cff280e3be3205f2d09aa6905af7cebe4af6 + manifestHash: efa827b02d817cdbecda224370dc54b3919e77690b2f50f6a57d9a52d6da137d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 9dff0c131ccb9..24355c38bf9e9 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 @@ -285,7 +285,7 @@ spec: - name: ebs-plugin securityContext: privileged: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:{{ .Version }} + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 args: - node - --endpoint=$(CSI_ENDPOINT) @@ -296,6 +296,12 @@ spec: - --v=2 env: {{- if IsIPv6Only }} + # TODO: Replace with "AWS_USE_DUALSTACK_ENDPOINT=true" when the relevant PR is merged: + # https://github.com/aws/aws-sdk-go/pull/3938 + - name: AWS_EC2_ENDPOINT + value: https://api.ec2.{{ Region }}.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 {{- end }} @@ -429,7 +435,7 @@ spec: {{ end }} containers: - name: ebs-plugin - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:{{ .Version }} + image: hakman/aws-ebs-csi-driver:test-aws-sdk-go-1-42 imagePullPolicy: IfNotPresent args: - controller @@ -444,6 +450,8 @@ spec: # https://github.com/aws/aws-sdk-go/pull/3938 - name: AWS_EC2_ENDPOINT value: https://api.ec2.{{ Region }}.aws + - name: AWS_USE_DUALSTACK_ENDPOINT + value: true - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE value: IPv6 {{- end }} diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go index 3cdbdd479f6bd..6bde340c43637 100644 --- a/upup/pkg/fi/cloudup/new_cluster.go +++ b/upup/pkg/fi/cloudup/new_cluster.go @@ -1075,6 +1075,12 @@ func setupTopology(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.S if opt.IPv6 { cluster.Spec.NonMasqueradeCIDR = "::/0" cluster.Spec.ExternalCloudControllerManager = &api.CloudControllerManagerConfig{} + if cluster.Spec.CloudConfig == nil { + cluster.Spec.CloudConfig = &api.CloudConfiguration{} + } + cluster.Spec.CloudConfig.AWSEBSCSIDriver = &api.AWSEBSCSIDriver{ + Enabled: fi.Bool(true), + } if api.CloudProviderID(cluster.Spec.CloudProvider) == api.CloudProviderAWS { for i := range cluster.Spec.Subnets { cluster.Spec.Subnets[i].IPv6CIDR = fmt.Sprintf("/64#%x", i) diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 951c686088403..010a030b5ace2 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -61,7 +61,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 55205b3ca13a56f46c4028c33cd926dd8e73d6c3fcef7c22386d3924f9806824 + manifestHash: fbe5890e42125b25e4b7e968fd874ddafc1ec48d792892ea118ccb7c476f8050 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io