openstack/openstack-helm
Code Issues Proposed changes

Ceph: Include release name in cluster roles to prevent collision

Browse Source 
This PS includes the release name in the cluster role to prevent
colision if the chart is deployed multiple times in the same
cluster.

Change-Id: I8e90367769a8b955981c0f2cf4f29756c448e1d7
This commit is contained in:
portdirect 2018-01-16 20:09:52 -05:00 committed by Pete Birley
parent e5168393ac
commit 7c68e446c0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/templates/deployment-cephfs-provisioner.yaml
View File

@ -18,7 +18,7 @@ limitations under the License.
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.cephfs_provisioner }} {{- $dependencies := .Values.dependencies.cephfs_provisioner }}
{{- $serviceAccountName := "ceph-cephfs-provisioner"}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "ceph-cephfs-provisioner" }}
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: ClusterRole kind: ClusterRole

2
ceph/templates/deployment-rbd-provisioner.yaml
View File

@ -18,7 +18,7 @@ limitations under the License.
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.rbd_provisioner }} {{- $dependencies := .Values.dependencies.rbd_provisioner }}
{{- $serviceAccountName := "ceph-rbd-provisioner"}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "ceph-rbd-provisioner" }}
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: ClusterRole kind: ClusterRole