Merge pull request #11704 from johngmyers/automated-cherry-pick-of-#1…

…1701-upstream-release-1.21 Automated cherry pick of #11701: Fix the CSI EBS DS CRB.
kubernetes · Jun 6, 2021 · 41cad71 · 41cad71
2 parents fc3aab5 + 8f216a7
commit 41cad71
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 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
@@ -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
@@ -1026,7 +1026,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
@@ -73,8 +73,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