openstack/openstack-helm
Code Issues Proposed changes

Merge "Ceph: Include release name in cluster roles to prevent collision"

Browse Source
This commit is contained in:
Zuul
2018-02-03 16:15:49 +00:00
committed by Gerrit Code Review
parent f7eb033b6f 7c68e446c0
commit 9f13514073
2 changed files with 2 additions and 2 deletions
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