[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

@@ -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
 ...

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: {}

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: {}

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:

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:

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:

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
 ...