Support externally managed configmap.

https://github.com/ceph/ceph-csi/issues/927

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
(cherry picked from commit d4c4954c9d)

charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.externallyManagedConfigmap }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -12,3 +13,4 @@ metadata:
 data:
   config.json: |-
 {{ toJson .Values.csiConfig | indent 4 -}}
+{{- end }}

charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml

@@ -190,6 +190,11 @@ spec:
         - name: ceph-csi-config
           configMap:
             name: {{ .Values.configMapName | quote }}
+{{- if .Values.configMapKey }}
+            items:
+              - key: {{ .Values.configMapKey | quote }}
+                path: config.json
+{{- end }}
         - name: keys-tmp-dir
           emptyDir: {
             medium: "Memory"

charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml

@@ -176,6 +176,11 @@ spec:
         - name: ceph-csi-config
           configMap:
             name: {{ .Values.configMapName | quote }}
+{{- if .Values.configMapKey }}
+            items:
+              - key: {{ .Values.configMapKey | quote }}
+                path: config.json
+{{- end }}
         - name: keys-tmp-dir
           emptyDir: {
             medium: "Memory"

charts/ceph-csi-cephfs/values.yaml

@@ -195,3 +195,7 @@ pluginDir: /var/lib/kubelet/plugins
 driverName: cephfs.csi.ceph.com
 # Name of the configmap used for state
 configMapName: ceph-csi-config-cephfs
+# Key to use in the Configmap if not config.json
+# configMapKey:
+# Use an externally provided configmap
+externallyManagedConfigmap: false

charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.externallyManagedConfigmap }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -12,3 +13,4 @@ metadata:
 data:
   config.json: |-
 {{ toJson .Values.csiConfig | indent 4 -}}
+{{- end }}

charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml

@@ -189,6 +189,11 @@ spec:
         - name: ceph-csi-config
           configMap:
             name: {{ .Values.configMapName | quote }}
+{{- if .Values.configMapKey }}
+            items:
+              - key: {{ .Values.configMapKey | quote }}
+                path: config.json
+{{- end }}
         - name: ceph-csi-encryption-kms-config
           configMap:
             name: {{ .Values.kmsConfigMapName | quote }}

charts/ceph-csi-rbd/templates/provisioner-deployment.yaml

@@ -193,6 +193,11 @@ spec:
         - name: ceph-csi-config
           configMap:
             name: {{ .Values.configMapName | quote }}
+{{- if .Values.configMapKey }}
+            items:
+              - key: {{ .Values.configMapKey | quote }}
+                path: config.json
+{{- end }}
         - name: ceph-csi-encryption-kms-config
           configMap:
             name: {{ .Values.kmsConfigMapName | quote }}

charts/ceph-csi-rbd/values.yaml

@@ -212,5 +212,9 @@ pluginDir: /var/lib/kubelet/plugins
 driverName: rbd.csi.ceph.com
 # Name of the configmap used for state
 configMapName: ceph-csi-config-rbd
+# Key to use in the Configmap if not config.json
+# configMapKey:
+# Use an externally provided configmap
+externallyManagedConfigmap: false
 # Name of the configmap used for encryption kms configuration
 kmsConfigMapName: ceph-csi-encryption-kms-config