From 9c50e255fb4f2a3cad918db2c4e5a9af1696f38a Mon Sep 17 00:00:00 2001 From: Silvio Gissi Date: Sat, 12 Feb 2022 10:01:10 -0700 Subject: [PATCH] helm: make ceph.conf ConfigMap name configurable ConfigMap name was hardcoded and led to conflicts. Fixes #2858. Signed-off-by: Silvio Gissi --- charts/ceph-csi-cephfs/README.md | 1 + charts/ceph-csi-cephfs/templates/ceph-conf.yaml | 2 +- charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml | 2 +- charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 2 +- charts/ceph-csi-cephfs/values.yaml | 2 ++ charts/ceph-csi-rbd/README.md | 1 + charts/ceph-csi-rbd/templates/ceph-conf.yaml | 2 +- charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml | 2 +- charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 2 +- charts/ceph-csi-rbd/values.yaml | 2 ++ 10 files changed, 12 insertions(+), 6 deletions(-) diff --git a/charts/ceph-csi-cephfs/README.md b/charts/ceph-csi-cephfs/README.md index 815e2539c..181a019f1 100644 --- a/charts/ceph-csi-cephfs/README.md +++ b/charts/ceph-csi-cephfs/README.md @@ -133,6 +133,7 @@ charts and their default values. | `driverName` | Name of the csi-driver | `cephfs.csi.ceph.com` | | `configMapName` | Name of the configmap which contains cluster configuration | `ceph-csi-config` | | `externallyManagedConfigmap` | Specifies the use of an externally provided configmap | `false` | +| `cephConfConfigMapName` | Name of the configmap which contains ceph.conf configuration | `ceph-config` | | `storageClass.create` | Specifies whether the StorageClass should be created | `false` | | `storageClass.name` | Specifies the cephFS StorageClass name | `csi-cephfs-sc` | | `storageClass.annotations` | Specifies the annotations for the cephFS storageClass | `[]` | diff --git a/charts/ceph-csi-cephfs/templates/ceph-conf.yaml b/charts/ceph-csi-cephfs/templates/ceph-conf.yaml index 25c773bca..3c8f8a47b 100644 --- a/charts/ceph-csi-cephfs/templates/ceph-conf.yaml +++ b/charts/ceph-csi-cephfs/templates/ceph-conf.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: ceph-config + name: {{ .Values.cephConfConfigMapName | quote }} namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index 27c85b194..f0fe4fe58 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -194,7 +194,7 @@ spec: path: /dev - name: ceph-config configMap: - name: ceph-config + name: {{ .Values.cephConfConfigMapName | quote }} - name: ceph-csi-config configMap: name: {{ .Values.configMapName | quote }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 7266f5ab4..762937d41 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -218,7 +218,7 @@ spec: path: /dev - name: ceph-config configMap: - name: ceph-config + name: {{ .Values.cephConfConfigMapName | quote }} - name: ceph-csi-config configMap: name: {{ .Values.configMapName | quote }} diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 0fa042d9b..b8e902fac 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -323,3 +323,5 @@ configMapName: ceph-csi-config # configMapKey: # Use an externally provided configmap externallyManagedConfigmap: false +# Name of the configmap used for ceph.conf +cephConfConfigMapName: ceph-config diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md index 7c30ec16c..a0e79d263 100644 --- a/charts/ceph-csi-rbd/README.md +++ b/charts/ceph-csi-rbd/README.md @@ -142,6 +142,7 @@ charts and their default values. | `driverName` | Name of the csi-driver | `rbd.csi.ceph.com` | | `configMapName` | Name of the configmap which contains cluster configuration | `ceph-csi-config` | | `externallyManagedConfigmap` | Specifies the use of an externally provided configmap | `false` | +| `cephConfConfigMapName` | Name of the configmap which contains ceph.conf configuration | `ceph-config` | | `kmsConfigMapName` | Name of the configmap used for encryption kms configuration | `ceph-csi-encryption-kms-config` | | `storageClass.create` | Specifies whether the StorageClass should be created | `false` | | `storageClass.name` | Specifies the rbd StorageClass name | `csi-rbd-sc` | diff --git a/charts/ceph-csi-rbd/templates/ceph-conf.yaml b/charts/ceph-csi-rbd/templates/ceph-conf.yaml index a9a6f0026..bcd0e4d39 100644 --- a/charts/ceph-csi-rbd/templates/ceph-conf.yaml +++ b/charts/ceph-csi-rbd/templates/ceph-conf.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: ceph-config + name: {{ .Values.cephConfConfigMapName | quote }} namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index acdae8e8b..90a1e311f 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -205,7 +205,7 @@ spec: path: /lib/modules - name: ceph-config configMap: - name: ceph-config + name: {{ .Values.cephConfConfigMapName | quote }} - name: ceph-csi-config configMap: name: {{ .Values.configMapName | quote }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 6861b2b4c..02616ffa7 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -255,7 +255,7 @@ spec: path: /lib/modules - name: ceph-config configMap: - name: ceph-config + name: {{ .Values.cephConfConfigMapName | quote }} - name: ceph-csi-config configMap: name: {{ .Values.configMapName | quote }} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 657e8b284..81d6df623 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -447,5 +447,7 @@ configMapName: ceph-csi-config # configMapKey: # Use an externally provided configmap externallyManagedConfigmap: false +# Name of the configmap used for ceph.conf +cephConfConfigMapName: ceph-config # Name of the configmap used for encryption kms configuration kmsConfigMapName: ceph-csi-encryption-kms-config