From 37c237fb78b9497d268158c9eee3df04a353ec19 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Tue, 1 Mar 2022 07:29:41 -0700
Subject: [PATCH] [ceph-mon] Correct configmap names for all resources

The recent name changes to the ceph-mon configmaps did not get
propagated to all resources in the chart. The hard-coded names in
the unchanged cases were correct and resources deployed
successfully, but this change corrects those configmap names across
all resources for the sake of robustness.

Change-Id: I3195e5ba2726892a7b6e0c31c0fac43bae4aa399
---
 ceph-mon/Chart.yaml                            | 2 +-
 ceph-mon/templates/deployment-mgr.yaml         | 4 ++--
 ceph-mon/templates/deployment-moncheck.yaml    | 4 ++--
 ceph-mon/templates/job-bootstrap.yaml          | 4 ++--
 ceph-mon/templates/job-keyring.yaml            | 2 +-
 ceph-mon/templates/job-storage-admin-keys.yaml | 2 +-
 releasenotes/notes/ceph-mon.yaml               | 1 +
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ceph-mon/Chart.yaml b/ceph-mon/Chart.yaml
index 721f52c90..7dab59d0d 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.21
+version: 0.1.22
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-mon/templates/deployment-mgr.yaml b/ceph-mon/templates/deployment-mgr.yaml
index 63743fb06..63d5a0cd5 100644
--- a/ceph-mon/templates/deployment-mgr.yaml
+++ b/ceph-mon/templates/deployment-mgr.yaml
@@ -182,11 +182,11 @@ spec:
           emptyDir: {}
         - name: ceph-mon-bin
           configMap:
-            name: ceph-mon-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
             defaultMode: 0555
         - name: ceph-mon-etc
           configMap:
-            name: ceph-mon-etc
+            name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }}
             defaultMode: 0444
         - name: pod-var-lib-ceph
           emptyDir: {}
diff --git a/ceph-mon/templates/deployment-moncheck.yaml b/ceph-mon/templates/deployment-moncheck.yaml
index 492afd4db..1fb97a61c 100644
--- a/ceph-mon/templates/deployment-moncheck.yaml
+++ b/ceph-mon/templates/deployment-moncheck.yaml
@@ -113,11 +113,11 @@ spec:
           emptyDir: {}
         - name: ceph-mon-etc
           configMap:
-            name: ceph-mon-etc
+            name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }}
             defaultMode: 0444
         - name: ceph-mon-bin
           configMap:
-            name: ceph-mon-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
             defaultMode: 0555
         - name: pod-var-lib-ceph
           emptyDir: {}
diff --git a/ceph-mon/templates/job-bootstrap.yaml b/ceph-mon/templates/job-bootstrap.yaml
index d45d63de7..1a4de7e90 100644
--- a/ceph-mon/templates/job-bootstrap.yaml
+++ b/ceph-mon/templates/job-bootstrap.yaml
@@ -73,11 +73,11 @@ spec:
           emptyDir: {}
         - name: ceph-mon-bin
           configMap:
-            name: ceph-mon-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
             defaultMode: 0555
         - name: ceph-mon-etc
           configMap:
-            name: ceph-mon-etc
+            name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }}
             defaultMode: 0444
         - name: ceph-client-admin-keyring
           secret:
diff --git a/ceph-mon/templates/job-keyring.yaml b/ceph-mon/templates/job-keyring.yaml
index 645b57754..1e1618b30 100644
--- a/ceph-mon/templates/job-keyring.yaml
+++ b/ceph-mon/templates/job-keyring.yaml
@@ -123,7 +123,7 @@ spec:
           emptyDir: {}
         - name: ceph-mon-bin
           configMap:
-            name: ceph-mon-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
             defaultMode: 0555
         - name: ceph-templates
           configMap:
diff --git a/ceph-mon/templates/job-storage-admin-keys.yaml b/ceph-mon/templates/job-storage-admin-keys.yaml
index fbbedff1b..6a728b80a 100644
--- a/ceph-mon/templates/job-storage-admin-keys.yaml
+++ b/ceph-mon/templates/job-storage-admin-keys.yaml
@@ -118,7 +118,7 @@ spec:
           emptyDir: {}
         - name: ceph-mon-bin
           configMap:
-            name: ceph-mon-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
             defaultMode: 0555
         - name: ceph-templates
           configMap:
diff --git a/releasenotes/notes/ceph-mon.yaml b/releasenotes/notes/ceph-mon.yaml
index 8633bf6c8..7c8136e8e 100644
--- a/releasenotes/notes/ceph-mon.yaml
+++ b/releasenotes/notes/ceph-mon.yaml
@@ -22,4 +22,5 @@ ceph-mon:
   - 0.1.19 Add a post-apply job to restart mons after mgrs
   - 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
 ...