Update IPv6 settings for AWS EBS CSI driver

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

Hide file tree

Showing 28 changed files with 89 additions and 37 deletions.
diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml
@@ -9,7 +9,11 @@ spec:
   authorization:
     rbac: {}
   channel: stable
-  cloudControllerManager: {}
+  cloudConfig:
+    awsEBSCSIDriver:
+      enabled: true
+  cloudControllerManager:
+    cloudProvider: aws
   cloudProvider: aws
   configBase: memfs://tests/ipv6.example.com
   etcdClusters:

diff --git a/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml
@@ -29,6 +29,7 @@ spec:
   iam:
     allowContainerRegistry: true
     legacy: false
+    useServiceAccountExternalPermissions: true
   kubelet:
     anonymousAuth: false
   kubernetesApiAccess:
@@ -40,6 +41,9 @@ spec:
   networking:
     cni: {}
   nonMasqueradeCIDR: 100.64.0.0/10
+  serviceAccountIssuerDiscovery:
+    discoveryStore: s3://k8s-kops-prow/minimal.example.com/discovery/minimal.example.com
+    enableAWSOIDCProvider: true
   sshAccess:
   - 0.0.0.0/0
   - ::/0

diff --git a/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml
@@ -29,6 +29,7 @@ spec:
   iam:
     allowContainerRegistry: true
     legacy: false
+    useServiceAccountExternalPermissions: true
   kubelet:
     anonymousAuth: false
   kubernetesApiAccess:
@@ -40,6 +41,9 @@ spec:
   networking:
     cni: {}
   nonMasqueradeCIDR: 100.64.0.0/10
+  serviceAccountIssuerDiscovery:
+    discoveryStore: s3://k8s-kops-prow/minimal.example.com/discovery/minimal.example.com
+    enableAWSOIDCProvider: true
   sshAccess:
   - 0.0.0.0/0
   - ::/0

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:
@@ -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/...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: 1b755a4654c486d41681bf71dff7fabc386a588707a31e9895ba53967c69ef2e
     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:
@@ -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/...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: fbe5890e42125b25e4b7e968fd874ddafc1ec48d792892ea118ccb7c476f8050
     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:
@@ -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/...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: fbe5890e42125b25e4b7e968fd874ddafc1ec48d792892ea118ccb7c476f8050
     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:
@@ -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/...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: fbe5890e42125b25e4b7e968fd874ddafc1ec48d792892ea118ccb7c476f8050
     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
@@ -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/...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: d7f43bb6e6312e13e0a2eb669c7c9f924e53bbefab6ade9662708f06db402490
     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
@@ -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/...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: d7f43bb6e6312e13e0a2eb669c7c9f924e53bbefab6ade9662708f06db402490
     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
@@ -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/...-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: d7f43bb6e6312e13e0a2eb669c7c9f924e53bbefab6ade9662708f06db402490
     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
@@ -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/.../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: d7f43bb6e6312e13e0a2eb669c7c9f924e53bbefab6ade9662708f06db402490
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/...er/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/...er/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/...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:
@@ -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/...-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: 00320af50d39504ef2edafccefaebfbe900a96edb77b9c5578527ff44dde608c
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io

diff --git a/...tion/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/...tion/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