helm: support for enable-topology flag

Signed-off-by: Praveen M <m.praveen@ibm.com>
ceph · Jul 25, 2024 · 697267f · 697267f
1 parent b2a300a
commit 697267f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
@@ -57,7 +57,7 @@ spec:
             - "--csi-addons-endpoint=$(CSI_ADDONS_ENDPOINT)"
             - "--v={{ .Values.logLevel }}"
             - "--drivername=$(DRIVER_NAME)"
-{{- if .Values.topology.domainLabels }}
+{{- if and .Values.topology.enabled .Values.topology.domainLabels }}
             - "--domainlabels={{ .Values.topology.domainLabels | join "," }}"
 {{- end }}
 {{- if .Values.instanceID }}

diff --git a/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml
@@ -81,7 +81,7 @@ rules:
     resources: ["persistentvolumeclaims/status"]
     verbs: ["update", "patch"]
 {{- end }}
-{{- if .Values.topology.domainLabels }}
+{{- if .Values.topology.enabled }}
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["get", "list","watch"]

diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -97,6 +97,7 @@ spec:
             - "--clustername={{ .Values.provisioner.clustername }}"
             {{- end }}
             - "--setmetadata={{ .Values.provisioner.setmetadata }}"
+            - "--enable-topology={{ .Values.topology.enabled | default false }}"
           env:
             - name: POD_IP
               valueFrom:

diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
@@ -300,6 +300,9 @@ provisioner:
   podSecurityContext: {}
 
 topology:
+  # Specifies whether topology based provisioning support should
+  # be exposed by CSI
+  enabled: false
   # domainLabels define which node labels to use as domains
   # for CSI nodeplugins to advertise their domains
   # NOTE: the value here serves as an example and needs to be

diff --git a/scripts/install-helm.sh b/scripts/install-helm.sh
@@ -19,6 +19,7 @@ DEPLOY_TIMEOUT=600
 DEPLOY_SC=0
 DEPLOY_SECRET=0
 ENABLE_READ_AFFINITY=1
+ENABLE_TOPOLOGY=1
 
 # ceph-csi specific variables
 NODE_LABEL_REGION="test.failure-domain/region"
@@ -178,6 +179,12 @@ install_cephcsi_helm_charts() {
     if [ "${ENABLE_READ_AFFINITY}" -eq 1 ]; then
         READ_AFFINITY_VALUES="--set readAffinity.enabled=true --set readAffinity.crushLocationLabels={${CRUSH_LOCATION_REGION_LABEL},${CRUSH_LOCATION_ZONE_LABEL}}"
     fi
+
+    # enable topologu
+    if [ "${ENABLE_TOPOLOGY}" -eq 1 ]; then
+        TOPOLOGY_VALUES="--set topology.enabled=true --set topology.domainLabels={${NODE_LABEL_REGION},${NODE_LABEL_ZONE}}"
+    fi
+
     # install ceph-csi-cephfs and ceph-csi-rbd charts
     # shellcheck disable=SC2086
     "${HELM}" install --namespace ${NAMESPACE} --set provisioner.fullnameOverride=csi-cephfsplugin-provisioner --set nodeplugin.fullnameOverride=csi-cephfsplugin --set configMapName=ceph-csi-config --set provisioner.replicaCount=1 --set-json='commonLabels={"app.kubernetes.io/name": "ceph-csi-cephfs", "app.kubernetes.io/managed-by": "helm"}' ${SET_SC_TEMPLATE_VALUES} ${CEPHFS_SECRET_TEMPLATE_VALUES} ${CEPHFS_CHART_NAME} "${SCRIPT_DIR}"/../charts/ceph-csi-cephfs ${READ_AFFINITY_VALUES} --set provisioner.snapshotter.args.enableVolumeGroupSnapshots=true
@@ -190,7 +197,7 @@ install_cephcsi_helm_charts() {
     kubectl_retry delete cm ceph-config --namespace "${NAMESPACE}"
 
     # shellcheck disable=SC2086
-    "${HELM}" install --namespace ${NAMESPACE} --set provisioner.fullnameOverride=csi-rbdplugin-provisioner --set nodeplugin.fullnameOverride=csi-rbdplugin --set configMapName=ceph-csi-config --set provisioner.replicaCount=1 --set-json='commonLabels={"app.kubernetes.io/name": "ceph-csi-rbd", "app.kubernetes.io/managed-by": "helm"}' ${SET_SC_TEMPLATE_VALUES} ${RBD_SECRET_TEMPLATE_VALUES} ${RBD_CHART_NAME} "${SCRIPT_DIR}"/../charts/ceph-csi-rbd --set topology.domainLabels="{${NODE_LABEL_REGION},${NODE_LABEL_ZONE}}" --set provisioner.maxSnapshotsOnImage=3 --set provisioner.minSnapshotsOnImage=2 ${READ_AFFINITY_VALUES} --set provisioner.snapshotter.args.enableVolumeGroupSnapshots=true
+    "${HELM}" install --namespace ${NAMESPACE} --set provisioner.fullnameOverride=csi-rbdplugin-provisioner --set nodeplugin.fullnameOverride=csi-rbdplugin --set configMapName=ceph-csi-config --set provisioner.replicaCount=1 --set-json='commonLabels={"app.kubernetes.io/name": "ceph-csi-rbd", "app.kubernetes.io/managed-by": "helm"}' ${SET_SC_TEMPLATE_VALUES} ${RBD_SECRET_TEMPLATE_VALUES} ${RBD_CHART_NAME} "${SCRIPT_DIR}"/../charts/ceph-csi-rbd --set provisioner.maxSnapshotsOnImage=3 --set provisioner.minSnapshotsOnImage=2 ${TOPOLOGY_VALUES} ${READ_AFFINITY_VALUES} --set provisioner.snapshotter.args.enableVolumeGroupSnapshots=true
 
     check_deployment_status app=ceph-csi-rbd "${NAMESPACE}"
     check_daemonset_status app=ceph-csi-rbd "${NAMESPACE}"