diff --git a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin-rbac.yml.j2 b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin-rbac.yml.j2 index 4dbaf4e17..c0c92de0e 100644 --- a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin-rbac.yml.j2 +++ b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin-rbac.yml.j2 @@ -8,7 +8,7 @@ metadata: namespace: kube-system --- -# external attacher +# external attacher kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -16,19 +16,16 @@ metadata: rules: - apiGroups: [""] resources: ["persistentvolumes"] - verbs: ["get", "list", "watch", "patch"] + verbs: ["get", "list", "watch", "update", "patch"] - apiGroups: [""] resources: ["nodes"] verbs: ["get", "list", "watch"] - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] - verbs: ["get", "list", "watch", "patch"] + verbs: ["get", "list", "watch", "update", "patch"] - apiGroups: ["storage.k8s.io"] resources: ["csinodes"] verbs: ["get", "list", "watch"] - - apiGroups: ["storage.k8s.io"] - resources: ["volumeattachments/status"] - verbs: ["patch"] --- @@ -209,4 +206,4 @@ subjects: roleRef: kind: Role name: external-resizer-cfg - apiGroup: rbac.authorization.k8s.io + apiGroup: rbac.authorization.k8s.io \ No newline at end of file diff --git a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2 b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2 index f6fe0f624..fd76073dd 100644 --- a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2 +++ b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2 @@ -23,8 +23,8 @@ spec: image: {{ csi_attacher_image_repo }}:{{ csi_attacher_image_tag }} imagePullPolicy: {{ k8s_image_pull_policy }} args: - - "--v=5" - "--csi-address=$(ADDRESS)" + - "--timeout=3m" {% if cinder_csi_controller_replicas is defined and cinder_csi_controller_replicas > 1 %} - --leader-election - --leader-election-namespace=kube-system @@ -40,6 +40,7 @@ spec: imagePullPolicy: {{ k8s_image_pull_policy }} args: - "--csi-address=$(ADDRESS)" + - "--timeout=3m" {% if cinder_topology is defined and cinder_topology %} - --feature-gates=Topology=true {% endif %} diff --git a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-driver.yml.j2 b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-driver.yml.j2 index 2f9f8a10a..5b681e4c4 100644 --- a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-driver.yml.j2 +++ b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-driver.yml.j2 @@ -5,3 +5,6 @@ metadata: spec: attachRequired: true podInfoOnMount: true + volumeLifecycleModes: + - Persistent + - Ephemeral