From 37d8de09934e2050e24b665901913a339f158aec Mon Sep 17 00:00:00 2001 From: Stephen Muth Date: Sat, 2 Sep 2023 08:42:30 -0400 Subject: [PATCH] helm: move discovery daemon settings into configmap This allows the rook mgr module to check if the discovery daemon is enabled. The udev blacklist setting was also moved just to keep similar settings in the same place. Signed-off-by: Stephen Muth --- deploy/charts/rook-ceph/templates/configmap.yaml | 4 ++++ deploy/charts/rook-ceph/templates/deployment.yaml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/charts/rook-ceph/templates/configmap.yaml b/deploy/charts/rook-ceph/templates/configmap.yaml index 1281c6ca7..440bcf854 100644 --- a/deploy/charts/rook-ceph/templates/configmap.yaml +++ b/deploy/charts/rook-ceph/templates/configmap.yaml @@ -10,6 +10,10 @@ data: ROOK_OBC_WATCH_OPERATOR_NAMESPACE: {{ .Values.enableOBCWatchOperatorNamespace | quote }} ROOK_CEPH_ALLOW_LOOP_DEVICES: {{ .Values.allowLoopDevices | quote }} ROOK_DISABLE_ADMISSION_CONTROLLER: {{ .Values.disableAdmissionController | quote }} + ROOK_ENABLE_DISCOVERY_DAEMON: {{ .Values.enableDiscoveryDaemon | quote }} +{{- if .Values.discoverDaemonUdev }} + DISCOVER_DAEMON_UDEV_BLACKLIST: {{ .Values.discoverDaemonUdev | quote }} +{{- end }} {{- if .Values.csi }} ROOK_CSI_ENABLE_RBD: {{ .Values.csi.enableRbdDriver | quote }} ROOK_CSI_ENABLE_CEPHFS: {{ .Values.csi.enableCephfsDriver | quote }} diff --git a/deploy/charts/rook-ceph/templates/deployment.yaml b/deploy/charts/rook-ceph/templates/deployment.yaml index fdf7d3d05..37c92fcec 100644 --- a/deploy/charts/rook-ceph/templates/deployment.yaml +++ b/deploy/charts/rook-ceph/templates/deployment.yaml @@ -85,10 +85,6 @@ spec: {{- end }} - name: ROOK_DISABLE_DEVICE_HOTPLUG value: "{{ .Values.disableDeviceHotplug }}" - - name: DISCOVER_DAEMON_UDEV_BLACKLIST - value: "{{ .Values.discoverDaemonUdev }}" - - name: ROOK_ENABLE_DISCOVERY_DAEMON - value: "{{ .Values.enableDiscoveryDaemon }}" - name: NODE_NAME valueFrom: