diff --git a/pkg/model/components/awsebscsidriver.go b/pkg/model/components/awsebscsidriver.go index 048c74ab2d4d3..bbfeadf438a89 100644 --- a/pkg/model/components/awsebscsidriver.go +++ b/pkg/model/components/awsebscsidriver.go @@ -37,7 +37,7 @@ func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error { } if c.Version == nil { - version := "v0.10.1" + version := "v1.0.0" c.Version = fi.String(version) } 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 0231f78f8a7f7..6458e89b7c703 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 @@ -211,6 +211,45 @@ roleRef: name: ebs-external-snapshotter-role apiGroup: rbac.authorization.k8s.io --- +# Source: aws-ebs-csi-driver/templates/clusterrolebinding-csi-node.yaml +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: ebs-csi-node-binding + labels: + app.kubernetes.io/name: aws-ebs-csi-driver +subjects: + - kind: ServiceAccount + name: ebs-csi-node-sa + namespace: kube-system +roleRef: + kind: ClusterRole + name: ebs-external-attacher-role + apiGroup: rbac.authorization.k8s.io +--- +# Source: aws-ebs-csi-driver/templates/clusterrole-csi-node.yaml +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: ebs-csi-node-role + labels: + app.kubernetes.io/name: aws-ebs-csi-driver +rules: + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get"] +--- +# Source: aws-ebs-csi-driver/templates/serviceaccount-csi-node.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: ebs-csi-node-sa + namespace: kube-system + labels: + app.kubernetes.io/name: aws-ebs-csi-driver + app.kubernetes.io/instance: aws-ebs-csi-driver + app.kubernetes.io/version: {{ .Version }} +--- # Source: aws-ebs-csi-driver/templates/node.yaml # Node Service kind: DaemonSet @@ -239,6 +278,7 @@ spec: nodeSelector: kubernetes.io/os: linux hostNetwork: true + serviceAccountName: ebs-csi-node-sa priorityClassName: system-node-critical tolerations: - operator: Exists @@ -258,6 +298,10 @@ spec: env: - name: CSI_ENDPOINT value: unix:/csi/csi.sock + - name: CSI_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName volumeMounts: - name: kubelet-dir mountPath: /var/lib/kubelet diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 675808d72a7bb..e7b1762031695 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: 89b6fd8933efc88c74a0931e465967a10f2dfde4 + manifestHash: ff68128cb2130042ff9b5cbdf3f75c2102b3bfad name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io