Merge pull request #11701 from olemarkus/fix-ebs-csi-role-crb

Fix the CSI EBS DS CRB.
kubernetes · Jun 6, 2021 · 9984ba0 · 9984ba0
2 parents 9f53dc1 + 8f8d6de
commit 9984ba0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/docs/releases/1.21-NOTES.md b/docs/releases/1.21-NOTES.md
@@ -40,6 +40,8 @@ See the [warm pool](https://kops.sigs.k8s.io/instance_groups/#warmpool-aws-only)
 
 # Required Actions
 
+* The ClusterRoleBinding for AWS EBS CSI DaemonSet has changed name. If you installed this addon before kOps 1.21, you need run `kubectl delete crb ebs-csi-node-binding`.
+
 * To support [Node Termination Handler's Queue Process mode](https://kops.sigs.k8s.io/addons/#node-termination-handler), AWS cluster deletion now requires the kops CLI have `sqs:ListQueues` and `events:ListRules` permissions regardless of whether or not the addon is used.
 
 # Deprecations

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
@@ -215,7 +215,7 @@ roleRef:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ebs-csi-node-binding
+  name: ebs-csi-node-getter-binding
   labels:
     app.kubernetes.io/name: aws-ebs-csi-driver
 subjects:
@@ -224,7 +224,7 @@ subjects:
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: ebs-external-attacher-role
+  name: ebs-csi-node-role
   apiGroup: rbac.authorization.k8s.io
 ---
 # Source: aws-ebs-csi-driver/templates/clusterrole-csi-node.yaml

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
@@ -999,7 +999,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 		if b.Cluster.Spec.CloudConfig != nil && b.Cluster.Spec.CloudConfig.AWSEBSCSIDriver != nil && fi.BoolValue(b.Cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled) {
 			key := "aws-ebs-csi-driver.addons.k8s.io"
 
-			version := "0.10.1-kops.2"
+			version := "1.0.0-kops.1"
 			{
 				id := "k8s-1.17"
 				location := key + "/" + id + ".yaml"

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
@@ -63,8 +63,8 @@ spec:
   - id: k8s-1.17
     kubernetesVersion: '>=1.17.0'
     manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
-    manifestHash: 7ccbed99da6bb0409268c07fd1ab079f04dc6140
+    manifestHash: e336aa3bcfabca58bee05b313feadbc6fb8aad7a
     name: aws-ebs-csi-driver.addons.k8s.io
     selector:
       k8s-addon: aws-ebs-csi-driver.addons.k8s.io
-    version: 0.10.1-kops.2
+    version: 1.0.0-kops.1