mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

helm: make ceph.conf ConfigMap name configurable

Browse Source 
ConfigMap name was hardcoded and led to conflicts. Fixes #2858.

Signed-off-by: Silvio Gissi <silvio@gissilabs.com>
This commit is contained in:
Silvio Gissi 2022-02-12 10:01:10 -07:00 committed by mergify[bot]
parent 4235178f7c
commit 9c50e255fb
10 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charts/ceph-csi-cephfs/README.md
View File

@ -133,6 +133,7 @@ charts and their default values.
| `driverName` | Name of the csi-driver | `cephfs.csi.ceph.com` | | `driverName` | Name of the csi-driver | `cephfs.csi.ceph.com` |
| `configMapName` | Name of the configmap which contains cluster configuration | `ceph-csi-config` | | `configMapName` | Name of the configmap which contains cluster configuration | `ceph-csi-config` |
| `externallyManagedConfigmap` | Specifies the use of an externally provided configmap | `false` | | `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.create` | Specifies whether the StorageClass should be created | `false` |
| `storageClass.name` | Specifies the cephFS StorageClass name | `csi-cephfs-sc` | | `storageClass.name` | Specifies the cephFS StorageClass name | `csi-cephfs-sc` |
| `storageClass.annotations` | Specifies the annotations for the cephFS storageClass | `[]` | | `storageClass.annotations` | Specifies the annotations for the cephFS storageClass | `[]` |

2
charts/ceph-csi-cephfs/templates/ceph-conf.yaml
View File

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: ceph-config name: {{ .Values.cephConfConfigMapName | quote }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
app: {{ include "ceph-csi-cephfs.name" . }} app: {{ include "ceph-csi-cephfs.name" . }}

2
charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml
View File

@ -194,7 +194,7 @@ spec:
path: /dev path: /dev
- name: ceph-config - name: ceph-config
configMap: configMap:
name: ceph-config name: {{ .Values.cephConfConfigMapName | quote }}
- name: ceph-csi-config - name: ceph-csi-config
configMap: configMap:
name: {{ .Values.configMapName | quote }} name: {{ .Values.configMapName | quote }}

2
charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
View File

@ -218,7 +218,7 @@ spec:
path: /dev path: /dev
- name: ceph-config - name: ceph-config
configMap: configMap:
name: ceph-config name: {{ .Values.cephConfConfigMapName | quote }}
- name: ceph-csi-config - name: ceph-csi-config
configMap: configMap:
name: {{ .Values.configMapName | quote }} name: {{ .Values.configMapName | quote }}

2
charts/ceph-csi-cephfs/values.yaml
View File

@ -323,3 +323,5 @@ configMapName: ceph-csi-config
# configMapKey: # configMapKey:
# Use an externally provided configmap # Use an externally provided configmap
externallyManagedConfigmap: false externallyManagedConfigmap: false
# Name of the configmap used for ceph.conf
cephConfConfigMapName: ceph-config

1
charts/ceph-csi-rbd/README.md
View File

@ -142,6 +142,7 @@ charts and their default values.
| `driverName` | Name of the csi-driver | `rbd.csi.ceph.com` | | `driverName` | Name of the csi-driver | `rbd.csi.ceph.com` |
| `configMapName` | Name of the configmap which contains cluster configuration | `ceph-csi-config` | | `configMapName` | Name of the configmap which contains cluster configuration | `ceph-csi-config` |
| `externallyManagedConfigmap` | Specifies the use of an externally provided configmap | `false` | | `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` | | `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.create` | Specifies whether the StorageClass should be created | `false` |
| `storageClass.name` | Specifies the rbd StorageClass name | `csi-rbd-sc` | | `storageClass.name` | Specifies the rbd StorageClass name | `csi-rbd-sc` |

2
charts/ceph-csi-rbd/templates/ceph-conf.yaml
View File

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: ceph-config name: {{ .Values.cephConfConfigMapName | quote }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
app: {{ include "ceph-csi-rbd.name" . }} app: {{ include "ceph-csi-rbd.name" . }}

2
charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
View File

@ -205,7 +205,7 @@ spec:
path: /lib/modules path: /lib/modules
- name: ceph-config - name: ceph-config
configMap: configMap:
name: ceph-config name: {{ .Values.cephConfConfigMapName | quote }}
- name: ceph-csi-config - name: ceph-csi-config
configMap: configMap:
name: {{ .Values.configMapName | quote }} name: {{ .Values.configMapName | quote }}

2
charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
View File

@ -255,7 +255,7 @@ spec:
path: /lib/modules path: /lib/modules
- name: ceph-config - name: ceph-config
configMap: configMap:
name: ceph-config name: {{ .Values.cephConfConfigMapName | quote }}
- name: ceph-csi-config - name: ceph-csi-config
configMap: configMap:
name: {{ .Values.configMapName | quote }} name: {{ .Values.configMapName | quote }}

2
charts/ceph-csi-rbd/values.yaml
View File

@ -447,5 +447,7 @@ configMapName: ceph-csi-config
# configMapKey: # configMapKey:
# Use an externally provided configmap # Use an externally provided configmap
externallyManagedConfigmap: false externallyManagedConfigmap: false
# Name of the configmap used for ceph.conf
cephConfConfigMapName: ceph-config
# Name of the configmap used for encryption kms configuration # Name of the configmap used for encryption kms configuration
kmsConfigMapName: ceph-csi-encryption-kms-config kmsConfigMapName: ceph-csi-encryption-kms-config