From 05cc202f75b773f675811619f8d2eaed77c6bef9 Mon Sep 17 00:00:00 2001 From: Bort Verwilst Date: Mon, 3 Sep 2018 12:00:10 +0200 Subject: [PATCH] [stable/nfs-client-provisioner] Make clusterrole(binding) conditional on rbac.create (#7500) * Update version to 3.0.2 Signed-off-by: Bart Verwilst * Add PodSecurityPolicy support Signed-off-by: Bart Verwilst * update docs for psp Signed-off-by: Bart Verwilst * add serviceaccount docs Signed-off-by: Bart Verwilst * rename psp support Signed-off-by: Bart Verwilst * Bump version Signed-off-by: Bart Verwilst * new major version Signed-off-by: Bart Verwilst * test psp Signed-off-by: Bart Verwilst * conditional rbac Signed-off-by: Bart Verwilst * bump version Signed-off-by: Bart Verwilst --- stable/nfs-client-provisioner/Chart.yaml | 2 +- stable/nfs-client-provisioner/templates/clusterrole.yaml | 2 ++ stable/nfs-client-provisioner/templates/clusterrolebinding.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stable/nfs-client-provisioner/Chart.yaml b/stable/nfs-client-provisioner/Chart.yaml index c202ba0282..1424b74516 100644 --- a/stable/nfs-client-provisioner/Chart.yaml +++ b/stable/nfs-client-provisioner/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 3.0.2 description: nfs-client is an automatic provisioner that used your *already configured* NFS server, automatically creating Persistent Volumes. name: nfs-client-provisioner home: https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client -version: 1.0.0 +version: 1.0.1 sources: - https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client maintainers: diff --git a/stable/nfs-client-provisioner/templates/clusterrole.yaml b/stable/nfs-client-provisioner/templates/clusterrole.yaml index 03bc93ec40..80c1c8124b 100644 --- a/stable/nfs-client-provisioner/templates/clusterrole.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrole.yaml @@ -1,3 +1,4 @@ +{{- if .Values.rbac.create }} kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -29,3 +30,4 @@ rules: verbs: ['use'] resourceNames: [{{ template "nfs-client-provisioner.fullname" . }}] {{- end }} +{{- end }} diff --git a/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml index a3dd1b9f7e..e04c719364 100644 --- a/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml @@ -1,3 +1,4 @@ +{{- if .Values.rbac.create }} kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -15,3 +16,4 @@ roleRef: kind: ClusterRole name: {{ template "nfs-client-provisioner.fullname" . }}-runner apiGroup: rbac.authorization.k8s.io +{{- end }}