From 1f192ac3dad8ff5e60ccbb6eb6adc7fb70296913 Mon Sep 17 00:00:00 2001 From: Andreas Date: Fri, 21 Jun 2024 13:37:56 +0200 Subject: [PATCH] helm: add cli argument instanceid Signed-off-by: Andreas --- PendingReleaseNotes.md | 1 + charts/ceph-csi-cephfs/README.md | 1 + charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml | 3 +++ charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 3 +++ charts/ceph-csi-cephfs/values.yaml | 3 +++ charts/ceph-csi-rbd/README.md | 1 + charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml | 3 +++ charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 3 +++ charts/ceph-csi-rbd/values.yaml | 3 +++ 9 files changed, 21 insertions(+) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index b4fabb66f..61686484f 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -6,5 +6,6 @@ - deploy: podSecurityContexts can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4664). - deploy: podSecurityContexts can be configured for ceph-csi-rbd chart in [PR](https://github.com/ceph/ceph-csi/pull/4668) +- deploy: instanceID can be optionally configured for ceph-csi charts in [PR](https://github.com/ceph/ceph-csi/pull/4666) ## NOTE diff --git a/charts/ceph-csi-cephfs/README.md b/charts/ceph-csi-cephfs/README.md index 5958d1a67..323bd7cdc 100644 --- a/charts/ceph-csi-cephfs/README.md +++ b/charts/ceph-csi-cephfs/README.md @@ -200,6 +200,7 @@ charts and their default values. | `selinuxMount` | Mount the host /etc/selinux inside pods to support selinux-enabled filesystems | `true` | | `CSIDriver.fsGroupPolicy` | Specifies the fsGroupPolicy for the CSI driver object | `File` | | `CSIDriver.seLinuxMount` | Specify for efficient SELinux volume relabeling | `true` | +| `instanceID` | Unique ID distinguishing this instance of Ceph CSI among other instances, when sharing Ceph clusters across CSI instances for provisioning. | ` ` | ### Command Line diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index 5da5ca165..ed984017b 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -59,6 +59,9 @@ spec: - "--endpoint=$(CSI_ENDPOINT)" - "--v={{ .Values.logLevel }}" - "--drivername=$(DRIVER_NAME)" +{{- if .Values.instanceID }} + - "--instanceid={{ .Values.instanceID }}" +{{- end }} {{- if .Values.nodeplugin.profiling.enabled }} - "--enableprofiling={{ .Values.nodeplugin.profiling.enabled }}" {{- end }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 685e39b66..c6c7c8278 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -79,6 +79,9 @@ spec: - "--endpoint=$(CSI_ENDPOINT)" - "--v={{ .Values.logLevel }}" - "--drivername=$(DRIVER_NAME)" +{{- if .Values.instanceID }} + - "--instanceid={{ .Values.instanceID }}" +{{- end }} {{- if .Values.provisioner.profiling.enabled }} - "--enableprofiling={{ .Values.provisioner.profiling.enabled }}" {{- end }} diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 3626dd17e..b3b7464ab 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -372,3 +372,6 @@ configMapName: ceph-csi-config externallyManagedConfigmap: false # Name of the configmap used for ceph.conf cephConfConfigMapName: ceph-config +# Unique ID distinguishing this instance of Ceph CSI among other instances, +# when sharing Ceph clusters across CSI instances for provisioning +# instanceID: default diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md index 7caddbf66..6ae069d5d 100644 --- a/charts/ceph-csi-rbd/README.md +++ b/charts/ceph-csi-rbd/README.md @@ -229,6 +229,7 @@ charts and their default values. | `selinuxMount` | Mount the host /etc/selinux inside pods to support selinux-enabled filesystems | `true` | | `CSIDriver.fsGroupPolicy` | Specifies the fsGroupPolicy for the CSI driver object | `File` | | `CSIDriver.seLinuxMount` | Specify for efficient SELinux volume relabeling | `true` | +| `instanceID` | Unique ID distinguishing this instance of Ceph CSI among other instances, when sharing Ceph clusters across CSI instances for provisioning. | ` ` | ### Command Line diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index 93eef0fc9..cf9b201ce 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -60,6 +60,9 @@ spec: {{- if .Values.topology.domainLabels }} - "--domainlabels={{ .Values.topology.domainLabels | join "," }}" {{- end }} +{{- if .Values.instanceID }} + - "--instanceid={{ .Values.instanceID }}" +{{- end }} {{- if .Values.nodeplugin.profiling.enabled }} - "--enableprofiling={{ .Values.nodeplugin.profiling.enabled }}" {{- end }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 638a8ebe2..adbc8604e 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -87,6 +87,9 @@ spec: {{- if .Values.provisioner.skipForceFlatten }} - "--skipforceflatten={{ .Values.provisioner.skipForceFlatten }}" {{- end }} + {{- if .Values.instanceID }} + - "--instanceid={{ .Values.instanceID }}" + {{- end }} {{- if .Values.provisioner.profiling.enabled }} - "--enableprofiling={{ .Values.provisioner.profiling.enabled }}" {{- end }} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index b5fe75833..73367eb9b 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -553,3 +553,6 @@ externallyManagedConfigmap: false cephConfConfigMapName: ceph-config # Name of the configmap used for encryption kms configuration kmsConfigMapName: ceph-csi-encryption-kms-config +# Unique ID distinguishing this instance of Ceph CSI among other instances, +# when sharing Ceph clusters across CSI instances for provisioning +# instanceID: default