From 938e54019d01f739238c5db756e2c6e2ffe8b5b7 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Mon, 26 Apr 2021 23:10:51 +0200 Subject: [PATCH 1/2] Fix arguments to csi-provisioner after bump to v2.2.0 Parameters for leader elections have changed in v2.2.0, which causes the csi-provisioner to not start anymore. --- .../aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 80b8902ee8..0231f78f8a 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 @@ -403,8 +403,7 @@ spec: - --csi-address=$(ADDRESS) - --v=5 - --feature-gates=Topology=true - - --enable-leader-election - - --leader-election-type=leases + - --leader-election=true - --extra-create-metadata=true env: - name: ADDRESS From b534a3272ff319a0a42a1d0565287ff08779c59a Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Tue, 27 Apr 2021 08:18:43 +0200 Subject: [PATCH 2/2] Run ./hack/update-expected.sh --- .../bootstrapchannelbuilder/awscloudcontroller/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 5b902e4512..675808d72a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -73,7 +73,7 @@ spec: - id: k8s-1.17 kubernetesVersion: '>=1.17.0' manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 0b66cd8dc9a3bd98e0138d424bc88d178f78e983 + manifestHash: 89b6fd8933efc88c74a0931e465967a10f2dfde4 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io