From caf46fef6a4690e6ae90b8de747c681631be7c96 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Tue, 10 Aug 2021 20:32:33 +0200 Subject: [PATCH] Bump AWS CSI Driver to 1.2.0 --- pkg/model/components/awsebscsidriver.go | 2 +- tests/e2e/scenarios/aws-ebs-csi/run-test.sh | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- ...mplate_nodes.minimal.example.com_user_data | 2 +- ...cket_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 37 +++++++++---------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- ...mplate_nodes.minimal.example.com_user_data | 2 +- ...cket_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 37 +++++++++---------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- ...mplate_nodes.minimal.example.com_user_data | 2 +- ...cket_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 37 +++++++++---------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...ers.minimal-warmpool.example.com_user_data | 2 +- ...des.minimal-warmpool.example.com_user_data | 4 +- ...cket_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 37 +++++++++---------- ...mpool.example.com-addons-bootstrap_content | 2 +- ...3_bucket_object_nodeupconfig-nodes_content | 2 +- .../k8s-1.17.yaml.template | 1 - .../awscloudcontroller/manifest.yaml | 2 +- 25 files changed, 93 insertions(+), 98 deletions(-) diff --git a/pkg/model/components/awsebscsidriver.go b/pkg/model/components/awsebscsidriver.go index 9168c7a42f..2c087dcc26 100644 --- a/pkg/model/components/awsebscsidriver.go +++ b/pkg/model/components/awsebscsidriver.go @@ -48,7 +48,7 @@ func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error { } if c.Version == nil { - version := "v1.1.0" + version := "v1.2.0" c.Version = fi.String(version) } diff --git a/tests/e2e/scenarios/aws-ebs-csi/run-test.sh b/tests/e2e/scenarios/aws-ebs-csi/run-test.sh index 6dcedc69c4..f788f64c3d 100755 --- a/tests/e2e/scenarios/aws-ebs-csi/run-test.sh +++ b/tests/e2e/scenarios/aws-ebs-csi/run-test.sh @@ -32,7 +32,7 @@ REPORT_DIR="${ARTIFACTS:-$(pwd)/_artifacts}/aws-ebs-csi-driver/" cd "$(mktemp -dt kops.XXXXXXXXX)" go get github.com/onsi/ginkgo/ginkgo -git clone --branch v1.1.0 https://github.com/kubernetes-sigs/aws-ebs-csi-driver.git . +git clone --branch v1.2.0 https://github.com/kubernetes-sigs/aws-ebs-csi-driver.git . # shellcheck disable=SC2164 cd tests/e2e-kubernetes/ diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 49549fbced..2df71315a9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -126,7 +126,7 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true containerRuntime: containerd containerd: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 3a31b51705..5fd06c4eeb 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -126,7 +126,7 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true containerRuntime: containerd containerd: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index bdd3663333..2feb9d0428 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -16,7 +16,7 @@ spec: cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true cloudControllerManager: {} cloudProvider: aws 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 6c719abf02..7ca6bf4490 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 @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -81,7 +81,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -183,7 +183,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -250,7 +250,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -308,7 +308,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -331,7 +331,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -354,7 +354,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -377,7 +377,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -441,7 +441,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -457,7 +457,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -473,7 +473,7 @@ spec: app: ebs-csi-node app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 spec: containers: - args: @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 + image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0 livenessProbe: failureThreshold: 5 httpGet: @@ -542,7 +542,6 @@ spec: volumeMounts: - mountPath: /csi name: plugin-dir - hostNetwork: true nodeSelector: kubernetes.io/os: linux priorityClassName: system-node-critical @@ -578,7 +577,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -595,7 +594,7 @@ spec: app: ebs-csi-controller app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 spec: affinity: podAntiAffinity: @@ -649,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.1.0 + image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -798,7 +797,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: @@ -816,7 +815,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller spec: 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 01ef52a5a4..8bc2cb3e3d 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 @@ -84,7 +84,7 @@ spec: k8s-addon: aws-cloud-controller.addons.k8s.io - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 6c616c67aea2c7d5a6e002132f54db9bfd2b639170eb4dda0436a1495f6fd87e + manifestHash: b3d70cf5c6c089ff60b0a1ceeb6fb309d0e38476391fe7c1f50564c03157016f 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_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3c2efd6a6b..4406135556 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -126,7 +126,7 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true containerRuntime: containerd containerd: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data index 3a31b51705..5fd06c4eeb 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -126,7 +126,7 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true containerRuntime: containerd containerd: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content index f3b9759478..4405a3cafb 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -16,7 +16,7 @@ spec: cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true cloudControllerManager: {} cloudProvider: aws 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 f19293609f..866278c9a8 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 @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -81,7 +81,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -183,7 +183,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -250,7 +250,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -308,7 +308,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -331,7 +331,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -354,7 +354,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -377,7 +377,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -441,7 +441,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -457,7 +457,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -473,7 +473,7 @@ spec: app: ebs-csi-node app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 spec: containers: - args: @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 + image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0 livenessProbe: failureThreshold: 5 httpGet: @@ -542,7 +542,6 @@ spec: volumeMounts: - mountPath: /csi name: plugin-dir - hostNetwork: true nodeSelector: kubernetes.io/os: linux priorityClassName: system-node-critical @@ -578,7 +577,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -595,7 +594,7 @@ spec: app: ebs-csi-controller app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 spec: affinity: podAntiAffinity: @@ -645,7 +644,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 + image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -742,7 +741,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: @@ -760,7 +759,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller spec: 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 83ef2a1750..441df16f76 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 @@ -84,7 +84,7 @@ spec: k8s-addon: aws-cloud-controller.addons.k8s.io - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3cb088c84aaa49afed34e8dc0d2a97cf013a173f719b8cfa5e14f367306f6d92 + manifestHash: 0c53680c3dec3a0f6cb36b7be64d8038e2babeb8aab3caf0d0b2d65d60e7fb27 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_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 50d9e3d0cf..71f97fddb0 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -126,7 +126,7 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true containerRuntime: containerd containerd: diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index 84504fa5bd..8f471bda08 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -126,7 +126,7 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true containerRuntime: containerd containerd: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content index c4fac4a3aa..e916695a4e 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -16,7 +16,7 @@ spec: cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true cloudProvider: aws clusterAutoscaler: 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 f19293609f..866278c9a8 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 @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -81,7 +81,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -183,7 +183,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -250,7 +250,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -308,7 +308,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -331,7 +331,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -354,7 +354,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -377,7 +377,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -441,7 +441,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -457,7 +457,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -473,7 +473,7 @@ spec: app: ebs-csi-node app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 spec: containers: - args: @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 + image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0 livenessProbe: failureThreshold: 5 httpGet: @@ -542,7 +542,6 @@ spec: volumeMounts: - mountPath: /csi name: plugin-dir - hostNetwork: true nodeSelector: kubernetes.io/os: linux priorityClassName: system-node-critical @@ -578,7 +577,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -595,7 +594,7 @@ spec: app: ebs-csi-controller app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 spec: affinity: podAntiAffinity: @@ -645,7 +644,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 + image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -742,7 +741,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: @@ -760,7 +759,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller spec: 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 41a37f6616..01dd42a247 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 @@ -78,7 +78,7 @@ spec: role.kubernetes.io/networking: "1" - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3cb088c84aaa49afed34e8dc0d2a97cf013a173f719b8cfa5e14f367306f6d92 + manifestHash: 0c53680c3dec3a0f6cb36b7be64d8038e2babeb8aab3caf0d0b2d65d60e7fb27 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_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index 413a2313c8..33f0303cf4 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -126,7 +126,7 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true containerRuntime: containerd containerd: 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 21dc1b7b33..c820e8c57c 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 @@ -126,7 +126,7 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true containerRuntime: containerd containerd: @@ -166,7 +166,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: YOSnpGX96KVy/pdH+luCHwXQ+Ocl2AyShQHqARSwBww= +NodeupConfigHash: jnrwGYGiEv/FWBTaQ/EPcLh801b3vEf7D4F3PVwRRPg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content index cb92936b21..5cea18d8ff 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -12,7 +12,7 @@ spec: cloudConfig: awsEBSCSIDriver: enabled: true - version: v1.1.0 + version: v1.2.0 manageStorageClasses: true cloudProvider: aws clusterDNSDomain: cluster.local 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 7c5e1f75af..c94fbd3cb7 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 @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -81,7 +81,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -183,7 +183,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -250,7 +250,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -308,7 +308,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -331,7 +331,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -354,7 +354,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -377,7 +377,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -441,7 +441,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -457,7 +457,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -473,7 +473,7 @@ spec: app: ebs-csi-node app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 spec: containers: - args: @@ -488,7 +488,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 + image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0 livenessProbe: failureThreshold: 5 httpGet: @@ -542,7 +542,6 @@ spec: volumeMounts: - mountPath: /csi name: plugin-dir - hostNetwork: true nodeSelector: kubernetes.io/os: linux priorityClassName: system-node-critical @@ -578,7 +577,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -595,7 +594,7 @@ spec: app: ebs-csi-controller app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 spec: affinity: podAntiAffinity: @@ -645,7 +644,7 @@ spec: key: access_key name: aws-secret optional: true - image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 + image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -742,7 +741,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: @@ -760,7 +759,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.1.0 + app.kubernetes.io/version: v1.2.0 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller spec: 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 8e5b4fe0f5..51776250c9 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 @@ -54,7 +54,7 @@ spec: role.kubernetes.io/networking: "1" - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bbb091c525f691a78ce4d470a1cf7fa4d657f5c005b2238fc187a081e1b81864 + manifestHash: 42b8011f95e8ddb8cde0f4877a57a674413314384ce5dda48a2cd75b988526ff 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 70282bc6dd..cf121c543b 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 @@ -66,7 +66,7 @@ containerdConfig: version: 1.4.9 warmPoolImages: - k8s.gcr.io/kube-proxy:v1.21.0 -- k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 +- k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.2.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.3 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 99614b4f44..2591b53f1b 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 @@ -277,7 +277,6 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - hostNetwork: true serviceAccountName: ebs-csi-node-sa priorityClassName: system-node-critical tolerations: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index c77639d1be..7b4d720d41 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -53,7 +53,7 @@ spec: k8s-addon: aws-cloud-controller.addons.k8s.io - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3cb088c84aaa49afed34e8dc0d2a97cf013a173f719b8cfa5e14f367306f6d92 + manifestHash: 0c53680c3dec3a0f6cb36b7be64d8038e2babeb8aab3caf0d0b2d65d60e7fb27 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io