From 77a94d46303edb9f770064091a5d4f7f98e8e08a Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Tue, 8 Mar 2022 07:57:08 -0700
Subject: [PATCH] [ceph-mon] Release-specific ceph-templates configmap name

This change corrects the ceph-templates configmap name to be
release-specific like the other configmaps in the chart. This
allows for more robustness in downstream implementations.

Change-Id: I1d09d14f9ba94dbbe11d8a80776f57b9cdf41210
---
 ceph-mon/Chart.yaml                            | 2 +-
 ceph-mon/templates/configmap-templates.yaml    | 2 +-
 ceph-mon/templates/job-keyring.yaml            | 2 +-
 ceph-mon/templates/job-storage-admin-keys.yaml | 2 +-
 releasenotes/notes/ceph-mon.yaml               | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ceph-mon/Chart.yaml b/ceph-mon/Chart.yaml
index 7dab59d0d..b8309765a 100644
--- a/ceph-mon/Chart.yaml
+++ b/ceph-mon/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Mon
 name: ceph-mon
-version: 0.1.22
+version: 0.1.23
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-mon/templates/configmap-templates.yaml b/ceph-mon/templates/configmap-templates.yaml
index 1776de9fd..42852ef24 100644
--- a/ceph-mon/templates/configmap-templates.yaml
+++ b/ceph-mon/templates/configmap-templates.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ceph-templates
+  name: {{ printf "%s-%s" $envAll.Release.Name "templates" | quote }}
 data:
   admin.keyring: |
 {{ .Values.conf.templates.keyring.admin | indent 4 }}
diff --git a/ceph-mon/templates/job-keyring.yaml b/ceph-mon/templates/job-keyring.yaml
index 1e1618b30..112496dea 100644
--- a/ceph-mon/templates/job-keyring.yaml
+++ b/ceph-mon/templates/job-keyring.yaml
@@ -127,7 +127,7 @@ spec:
             defaultMode: 0555
         - name: ceph-templates
           configMap:
-            name: ceph-templates
+            name: {{ printf "%s-%s" $envAll.Release.Name "templates" | quote }}
             defaultMode: 0444
 {{- end }}
 {{- end }}
diff --git a/ceph-mon/templates/job-storage-admin-keys.yaml b/ceph-mon/templates/job-storage-admin-keys.yaml
index 6a728b80a..a8812f884 100644
--- a/ceph-mon/templates/job-storage-admin-keys.yaml
+++ b/ceph-mon/templates/job-storage-admin-keys.yaml
@@ -122,6 +122,6 @@ spec:
             defaultMode: 0555
         - name: ceph-templates
           configMap:
-            name: ceph-templates
+            name: {{ printf "%s-%s" $envAll.Release.Name "templates" | quote }}
             defaultMode: 0444
 {{- end }}
diff --git a/releasenotes/notes/ceph-mon.yaml b/releasenotes/notes/ceph-mon.yaml
index 7c8136e8e..8a593c1ff 100644
--- a/releasenotes/notes/ceph-mon.yaml
+++ b/releasenotes/notes/ceph-mon.yaml
@@ -23,4 +23,5 @@ ceph-mon:
   - 0.1.20 Consolidate mon_endpoints discovery
   - 0.1.21 Change configmap names to be based on release name
   - 0.1.22 Correct configmap names for all resources
+  - 0.1.23 Release-specific ceph-template configmap name
 ...