From c256cce5376fb2787b48fe699959bd29ccc73bb8 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Wed, 12 Dec 2018 07:29:01 -0600 Subject: [PATCH] Ceph: Allow multiple test pods to be present in clusters This ps allows multiple ceph test pods to be present in cluster with more than one ceph deployment. Change-Id: I002a8b4681d97ed6ab95af23e1938870c28f5a83 Signed-off-by: Pete Birley --- ceph-osd/templates/pod-helm-tests.yaml | 2 +- ceph-rgw/templates/pod-helm-tests.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-osd/templates/pod-helm-tests.yaml b/ceph-osd/templates/pod-helm-tests.yaml index 7d4272e5b..d5426064c 100644 --- a/ceph-osd/templates/pod-helm-tests.yaml +++ b/ceph-osd/templates/pod-helm-tests.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.helm_tests }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-osd-test" }} +{{- $serviceAccountName := printf "%s-%s" $envAll.Release.Name "test" }} {{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: v1 diff --git a/ceph-rgw/templates/pod-helm-tests.yaml b/ceph-rgw/templates/pod-helm-tests.yaml index 922288475..1df3231fa 100644 --- a/ceph-rgw/templates/pod-helm-tests.yaml +++ b/ceph-rgw/templates/pod-helm-tests.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.helm_tests .Values.deployment.ceph }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-rgw-test" }} +{{- $serviceAccountName := printf "%s-%s" $envAll.Release.Name "test" }} {{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1