From 7afddb41d6fddb10d1c2aadc5f22016c40522c2a Mon Sep 17 00:00:00 2001 From: Andreas Date: Sat, 6 Jul 2024 07:42:05 +0200 Subject: [PATCH] deploy: support omap data store in radosnamespace via cli argument 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 | 2 ++ 5 files changed, 10 insertions(+) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 7b4ccb4528f..9e2f46a3b66 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -9,5 +9,6 @@ - deploy: instanceID can be optionally configured for ceph-csi charts in [PR](https://github.com/ceph/ceph-csi/pull/4666) - rbd: add support for flattenMode option for replication in [PR](https://github.com/ceph/ceph-csi/pull/4678) - cephfs: support omap data store in radosnamespace via cli argument in [PR](https://github.com/ceph/ceph-csi/pull/4652) +- deploy: radosNamespaceCephFS can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4652) ## NOTE diff --git a/charts/ceph-csi-cephfs/README.md b/charts/ceph-csi-cephfs/README.md index 9ba8e0527f0..703b923ff75 100644 --- a/charts/ceph-csi-cephfs/README.md +++ b/charts/ceph-csi-cephfs/README.md @@ -201,6 +201,7 @@ charts and their default values. | `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. | ` ` | +| `radosNamespaceCephFS` | CephFS RadosNamespace used to store CSI specific objects and keys. | ` ` | ### Command Line diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index ed984017bd6..b91b8047a00 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -62,6 +62,9 @@ spec: {{- if .Values.instanceID }} - "--instanceid={{ .Values.instanceID }}" {{- end }} +{{- if .Values.radosNamespaceCephFS }} + - "--radosnamespacecephfs={{ .Values.radosNamespaceCephFS }}" +{{- 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 c6c7c8278e2..3257705af59 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -82,6 +82,9 @@ spec: {{- if .Values.instanceID }} - "--instanceid={{ .Values.instanceID }}" {{- end }} +{{- if .Values.radosNamespaceCephFS }} + - "--radosnamespacecephfs={{ .Values.radosNamespaceCephFS }}" +{{- 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 685cc1983d4..f2cc91b2511 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -372,6 +372,8 @@ configMapName: ceph-csi-config externallyManagedConfigmap: false # Name of the configmap used for ceph.conf cephConfConfigMapName: ceph-config +# CephFS RadosNamespace used to store CSI specific objects and keys. +# radosNamespaceCephFS: csi # Unique ID distinguishing this instance of Ceph CSI among other instances, # when sharing Ceph clusters across CSI instances for provisioning # instanceID: default