From 397b22b31abe1963844ac0037bcb931a958c0a15 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Mon, 20 Dec 2021 15:02:29 +0100 Subject: [PATCH] Do not install ClusterRole and binding used by in-tree volume provider if CSI is used --- .../addons/storage-aws.addons.k8s.io/v1.15.0.yaml.template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml.template b/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml.template index 97f05daf5f..1d9d5f194b 100644 --- a/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml.template +++ b/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.15.0.yaml.template @@ -55,7 +55,7 @@ provisioner: ebs.csi.aws.com allowVolumeExpansion: true volumeBindingMode: WaitForFirstConsumer {{ end }} -{{ end }} + --- apiVersion: rbac.authorization.k8s.io/v1 @@ -98,3 +98,5 @@ subjects: - kind: ServiceAccount name: aws-cloud-provider namespace: kube-system + +{{ end }} \ No newline at end of file