Update IPv6 settings for AWS EBS CSI driver

kubernetes · Nov 22, 2021 · a74e2b2 · a74e2b2
1 parent 3e683ca
commit a74e2b2
Show file tree

Hide file tree

Showing 22 changed files with 54 additions and 22 deletions.
diff --git a/...ucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/...ucket_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:

diff --git a/...ny-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/...ny-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: a5d345602bcb5a55ffcf5bed0a941e4d9efd8c4c878a768607bff4b99a3449eb
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/...ucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/...ucket_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:

diff --git a/...er/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/...er/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: 1bcff0b3dc966a21f708a89f29c150bce4cfd42258f07eadd36129c528574751
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/...ucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/...ucket_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:

diff --git a/...luster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/...luster/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: 1bcff0b3dc966a21f708a89f29c150bce4cfd42258f07eadd36129c528574751
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/...ucket_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/...ucket_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:

diff --git a/...uster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/...uster/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: 1bcff0b3dc966a21f708a89f29c150bce4cfd42258f07eadd36129c528574751
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/..._object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/..._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

diff --git a/...l-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/...l-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: 778296fdc8e625cf343e09b1e0d29af36d072ed435c09d35deb8737c569339f9
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/..._object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/..._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

diff --git a/...l-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/...l-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: 778296fdc8e625cf343e09b1e0d29af36d072ed435c09d35deb8737c569339f9
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/..._object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/..._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

diff --git a/...-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/...-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: 778296fdc8e625cf343e09b1e0d29af36d072ed435c09d35deb8737c569339f9
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/..._object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/..._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

diff --git a/.../minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/.../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: 778296fdc8e625cf343e09b1e0d29af36d072ed435c09d35deb8737c569339f9
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/...ect_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/...ect_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:

diff --git a/...-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content b/...-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: aee4cc64956cb4fd44321663258016403c54887d519406465a83bc03c08e3190
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/..._object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/..._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:

diff --git a/.../privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content b/.../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: 6213a9947b95bcae6a19a26fefb1a9c097b6f09240052dc51dc810e6c4f0ec33
     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
@@ -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 }}
@@ -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/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: 1bcff0b3dc966a21f708a89f29c150bce4cfd42258f07eadd36129c528574751
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io