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: remove feature gate topology

Browse Source 
This commit removes the Topology feature gate as it is now enabled
by default and will be removed in a future release.

Signed-off-by: Praveen M <m.praveen@ibm.com>
This commit is contained in:
Praveen M 2024-06-11 21:00:16 +05:30 committed by mergify[bot]
parent 5118ff64e8
commit 97b847fd6a
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ spec:
- "--csi-addons-endpoint=$(CSI_ADDONS_ENDPOINT)" - "--csi-addons-endpoint=$(CSI_ADDONS_ENDPOINT)"
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--drivername=$(DRIVER_NAME)" - "--drivername=$(DRIVER_NAME)"
{{- if .Values.topology.enabled }} {{- if .Values.topology.domainLabels }}
- "--domainlabels={{ .Values.topology.domainLabels | join "," }}" - "--domainlabels={{ .Values.topology.domainLabels | join "," }}"
{{- end }} {{- end }}
{{- if .Values.nodeplugin.profiling.enabled }} {{- if .Values.nodeplugin.profiling.enabled }}

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

@ -81,7 +81,7 @@ rules:
resources: ["persistentvolumeclaims/status"] resources: ["persistentvolumeclaims/status"]
verbs: ["update", "patch"] verbs: ["update", "patch"]
{{- end }} {{- end }}
{{- if .Values.topology.enabled }} {{- if .Values.topology.domainLabels }}
- apiGroups: [""] - apiGroups: [""]
resources: ["nodes"] resources: ["nodes"]
verbs: ["get", "list","watch"] verbs: ["get", "list","watch"]

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

@ -145,9 +145,6 @@ spec:
- "--extra-create-metadata=true" - "--extra-create-metadata=true"
- "--feature-gates=HonorPVReclaimPolicy=true" - "--feature-gates=HonorPVReclaimPolicy=true"
- "--prevent-volume-mode-conversion=true" - "--prevent-volume-mode-conversion=true"
{{- if .Values.topology.enabled }}
- "--feature-gates=Topology=true"
{{- end }}
{{- range .Values.provisioner.provisioner.extraArgs }} {{- range .Values.provisioner.provisioner.extraArgs }}
- "--{{ . }}" - "--{{ . }}"
{{- end }} {{- end }}

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

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

2
scripts/install-helm.sh
View File

@ -190,7 +190,7 @@ install_cephcsi_helm_charts() {
kubectl_retry delete cm ceph-config --namespace "${NAMESPACE}" kubectl_retry delete cm ceph-config --namespace "${NAMESPACE}"
# shellcheck disable=SC2086 # 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.enabled=true --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 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
check_deployment_status app=ceph-csi-rbd "${NAMESPACE}" check_deployment_status app=ceph-csi-rbd "${NAMESPACE}"
check_daemonset_status app=ceph-csi-rbd "${NAMESPACE}" check_daemonset_status app=ceph-csi-rbd "${NAMESPACE}"