Merge "Ceph-rgw: make configmap names to be driven via chart values"

ceph-rgw/templates/configmap-bin.yaml

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_bin .Values.deployment.ceph }}
+{{- if or (.Values.deployment.rgw_keystone_user_and_endpoints) (.Values.deployment.ceph) }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
@@ -38,7 +38,5 @@ data:
 {{ tuple "bin/_ceph-rgw-storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   ceph-admin-keyring.sh: |
 {{ tuple "bin/_ceph-admin-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  rgw-s3-admin.sh: |
-{{ tuple "bin/rgw/_rgw-s3-admin.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 
 {{- end }}

ceph-rgw/templates/configmap-ceph-rgw-templates.yaml

@@ -20,7 +20,7 @@ limitations under the License.
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ceph-templates
+  name: {{ printf "%s-%s" $envAll.Release.Name "ceph-templates" | quote }}
 data:
   bootstrap.keyring.rgw: |
 {{ .Values.conf.templates.keyring.bootstrap.rgw | indent 4 }}

ceph-rgw/templates/job-rgw-storage-init.yaml

@@ -121,11 +121,11 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         - name: ceph-templates
           configMap:
-            name: ceph-templates
+            name: {{ printf "%s-%s" $envAll.Release.Name "ceph-templates" | quote }}
             defaultMode: 0444
         - name: ceph-keyring
           secret:

ceph-rgw/values.yaml

@@ -111,6 +111,9 @@ pod:
           memory: "1024Mi"
           cpu: "2000m"
 
+ceph_client:
+  configmap: ceph-etc
+
 secrets:
   keyrings:
     mon: ceph-mon-keyring