Update IPv6 settings for AWS EBS CSI driver

kubernetes · Nov 21, 2021 · a50b8e1 · a50b8e1
1 parent 3e683ca
commit a50b8e1
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 16 deletions.
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,8 @@ spec:
         - --logtostderr
         - --v=2
         env:
+        - name: AWS_USE_DUALSTACK_ENDPOINT
+          value: true
         - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE
           value: IPv6
         - name: CSI_ENDPOINT
@@ -627,8 +629,8 @@ spec:
         - --extra-tags=KubernetesCluster=minimal-ipv6.example.com
         - --v=5
         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: b24f496f784d4290b8ee0a637c0c9174156741fc724105653a8d11aee1205595
     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,8 @@ spec:
         - --logtostderr
         - --v=2
         env:
+        - name: AWS_USE_DUALSTACK_ENDPOINT
+          value: true
         - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE
           value: IPv6
         - name: CSI_ENDPOINT
@@ -627,8 +629,8 @@ spec:
         - --extra-tags=KubernetesCluster=minimal-ipv6.example.com
         - --v=5
         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: b24f496f784d4290b8ee0a637c0c9174156741fc724105653a8d11aee1205595
     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,8 @@ spec:
         - --logtostderr
         - --v=2
         env:
+        - name: AWS_USE_DUALSTACK_ENDPOINT
+          value: true
         - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE
           value: IPv6
         - name: CSI_ENDPOINT
@@ -627,8 +629,8 @@ spec:
         - --extra-tags=KubernetesCluster=minimal-ipv6.example.com
         - --v=5
         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: b24f496f784d4290b8ee0a637c0c9174156741fc724105653a8d11aee1205595
     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,8 @@ spec:
         - --logtostderr
         - --v=2
         env:
+        - name: AWS_USE_DUALSTACK_ENDPOINT
+          value: true
         - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE
           value: IPv6
         - name: CSI_ENDPOINT
@@ -627,8 +629,8 @@ spec:
         - --extra-tags=KubernetesCluster=minimal-ipv6.example.com
         - --v=5
         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: b24f496f784d4290b8ee0a637c0c9174156741fc724105653a8d11aee1205595
     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
@@ -296,6 +296,8 @@ spec:
             - --v=2
           env:
             {{- if IsIPv6Only }}
+            - name: AWS_USE_DUALSTACK_ENDPOINT
+              value: true
             - name: AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE
               value: IPv6
             {{- end }}
@@ -440,10 +442,8 @@ spec:
             - --v=5
           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 }}