From 7c68e446c0b9145d53f9f3835eef859f58e993bf Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Tue, 16 Jan 2018 20:09:52 -0500
Subject: [PATCH] Ceph: Include release name in cluster roles to prevent
 collision

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
---
 ceph/templates/deployment-cephfs-provisioner.yaml | 2 +-
 ceph/templates/deployment-rbd-provisioner.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ceph/templates/deployment-cephfs-provisioner.yaml b/ceph/templates/deployment-cephfs-provisioner.yaml
index b79e7b6f48..83fb221ed5 100644
--- a/ceph/templates/deployment-cephfs-provisioner.yaml
+++ b/ceph/templates/deployment-cephfs-provisioner.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 {{- $envAll := . }}
 {{- $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" }}
 ---
 kind: ClusterRole
diff --git a/ceph/templates/deployment-rbd-provisioner.yaml b/ceph/templates/deployment-rbd-provisioner.yaml
index 0c8e973932..7e51c8ef1b 100644
--- a/ceph/templates/deployment-rbd-provisioner.yaml
+++ b/ceph/templates/deployment-rbd-provisioner.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 {{- $envAll := . }}
 {{- $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" }}
 ---
 kind: ClusterRole