Merge "Ceph provisioners: Make configmap and job names configurable"

ceph-provisioners/templates/configmap-bin-provisioner.yaml

@@ -20,7 +20,7 @@ limitations under the License.
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ceph-provisioners-bin-clients
+  name: {{ printf "%s-%s" $envAll.Release.Name "ceph-prov-bin-clients" | quote }}
 data:
   provisioner-rbd-namespace-client-key-manager.sh: |
 {{ tuple "bin/provisioner/rbd/_namespace-client-key-manager.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}

ceph-provisioners/templates/configmap-bin.yaml

@@ -20,7 +20,7 @@ limitations under the License.
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ceph-provisioners-bin
+  name: {{ printf "%s-%s" $envAll.Release.Name "ceph-prov-bin" | quote }}
 data:
 {{- if .Values.images.local_registry.active }}
   image-repo-sync.sh: |

ceph-provisioners/templates/configmap-etc-client.yaml

@@ -52,5 +52,5 @@ data:
 {{- end }}
 {{- end }}
 {{- if .Values.manifests.configmap_etc }}
-{{- list "ceph-etc" . | include "ceph.configmap.etc" }}
+{{- list  .Values.storageclass.rbd.ceph_configmap_name . | include "ceph.configmap.etc" }}
 {{- end }}

ceph-provisioners/templates/deployment-cephfs-provisioner.yaml

@@ -173,6 +173,6 @@ spec:
       volumes:
         - name: ceph-provisioners-bin
           configMap:
-            name: ceph-provisioners-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "ceph-prov-bin" | quote }}
             defaultMode: 0555
 {{- end }}

ceph-provisioners/templates/deployment-rbd-provisioner.yaml

@@ -163,6 +163,6 @@ spec:
       volumes:
         - name: ceph-provisioners-bin
           configMap:
-            name: ceph-provisioners-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "ceph-prov-bin" | quote }}
             defaultMode: 0555
 {{- end }}

ceph-provisioners/templates/job-bootstrap.yaml

@@ -58,11 +58,11 @@ spec:
       volumes:
         - name: ceph-provisioners-bin
           configMap:
-            name: ceph-provisioners-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "ceph-prov-bin" | quote }}
             defaultMode: 0555
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.storageclass.rbd.ceph_configmap_name }}
             defaultMode: 0444
         - name: ceph-client-admin-keyring
           secret:

ceph-provisioners/templates/job-cephfs-client-key.yaml

@@ -119,6 +119,6 @@ spec:
       volumes:
         - name: ceph-provisioners-bin
           configMap:
-            name: ceph-provisioners-bin
+            name: {{ printf "%s-%s" $envAll.Release.Name "ceph-prov-bin" | quote }}
             defaultMode: 0555
 {{- end }}

ceph-provisioners/templates/job-namespace-client-key-cleaner.yaml

@@ -19,7 +19,7 @@ limitations under the License.
 
 {{- $randStringSuffix := randAlphaNum 5 | lower }}
 
-{{- $serviceAccountName := print "ceph-namespace-client-key-cleaner-" $randStringSuffix }}
+{{- $serviceAccountName := print $envAll.Release.Name "-ceph-ns-key-cleaner" }}
 {{ tuple $envAll "namespace_client_key_cleaner" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
@@ -52,7 +52,7 @@ subjects:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: ceph-namespace-client-key-cleaner-{{ $randStringSuffix }}
+  name: {{ $serviceAccountName }}
   annotations:
     "helm.sh/hook": pre-delete
 spec:
@@ -88,6 +88,6 @@ spec:
       volumes:
         - name: ceph-provisioners-bin-clients
           configMap:
-            name: ceph-provisioners-bin-clients
+            name: {{ printf "%s-%s" $envAll.Release.Name "ceph-prov-bin-clients" | quote }}
             defaultMode: 0555
 {{- end }}

ceph-provisioners/templates/job-namespace-client-key.yaml

@@ -19,7 +19,7 @@ limitations under the License.
 
 {{- $randStringSuffix := randAlphaNum 5 | lower }}
 
-{{- $serviceAccountName := "ceph-namespace-client-key-generator" }}
+{{- $serviceAccountName := print $envAll.Release.Name "-ceph-ns-key-generator" }}
 {{ tuple $envAll "namespace_client_key_generator" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
@@ -81,7 +81,7 @@ subjects:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: ceph-namespace-client-key-generator
+  name: {{ $serviceAccountName }}
 spec:
   template:
     metadata:
@@ -119,6 +119,6 @@ spec:
       volumes:
         - name: ceph-provisioners-bin-clients
           configMap:
-            name: ceph-provisioners-bin-clients
+            name: {{ printf "%s-%s" $envAll.Release.Name "ceph-prov-bin-clients" | quote }}
             defaultMode: 0555
 {{- end }}

ceph-provisioners/values.yaml

@@ -176,6 +176,7 @@ storageclass:
     monitors: null
     pool: rbd
     admin_id: admin
+    ceph_configmap_name: ceph-etc
     admin_secret_name: pvc-ceph-conf-combined-storageclass
     admin_secret_namespace: ceph
     user_id: admin