kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update cinder csi manifests (#6434)

pull/6410/head
Hugo Blom 2020-07-27 08:32:17 +02:00 committed by GitHub
parent aa21edeb53
commit 1f9841f609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin-rbac.yml.j2
View File

@ -8,7 +8,7 @@ metadata:
namespace: kube-system namespace: kube-system
--- ---
# external attacher # external attacher
kind: ClusterRole kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
@ -16,19 +16,16 @@ metadata:
rules: rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["persistentvolumes"] resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "patch"] verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["nodes"] resources: ["nodes"]
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"] resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "patch"] verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["csinodes"] resources: ["csinodes"]
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments/status"]
verbs: ["patch"]
--- ---
@ -209,4 +206,4 @@ subjects:
roleRef: roleRef:
kind: Role kind: Role
name: external-resizer-cfg name: external-resizer-cfg
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io

3
roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
View File

@ -23,8 +23,8 @@ spec:
image: {{ csi_attacher_image_repo }}:{{ csi_attacher_image_tag }} image: {{ csi_attacher_image_repo }}:{{ csi_attacher_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
args: args:
- "--v=5"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=3m"
{% if cinder_csi_controller_replicas is defined and cinder_csi_controller_replicas > 1 %} {% if cinder_csi_controller_replicas is defined and cinder_csi_controller_replicas > 1 %}
- --leader-election - --leader-election
- --leader-election-namespace=kube-system - --leader-election-namespace=kube-system
@ -40,6 +40,7 @@ spec:
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=3m"
{% if cinder_topology is defined and cinder_topology %} {% if cinder_topology is defined and cinder_topology %}
- --feature-gates=Topology=true - --feature-gates=Topology=true
{% endif %} {% endif %}

3
roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-driver.yml.j2
View File

@ -5,3 +5,6 @@ metadata:
spec: spec:
attachRequired: true attachRequired: true
podInfoOnMount: true podInfoOnMount: true
volumeLifecycleModes:
- Persistent
- Ephemeral