From 3e360aadf01607da7b90201e13263799e3d4896f Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Thu, 18 Apr 2024 12:21:19 +0100 Subject: [PATCH] chore(helm): add helm var to control safe mounts Can be used to either force safeMounts ("always") or to disable them ("no") Signed-off-by: Tiago Castro --- chart/templates/mayastor/csi/csi-node-daemonset.yaml | 4 ++++ chart/templates/mayastor/io/io-engine-daemonset.yaml | 4 ++++ dependencies/control-plane | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/chart/templates/mayastor/csi/csi-node-daemonset.yaml b/chart/templates/mayastor/csi/csi-node-daemonset.yaml index 40054d511..b8cea96bb 100644 --- a/chart/templates/mayastor/csi/csi-node-daemonset.yaml +++ b/chart/templates/mayastor/csi/csi-node-daemonset.yaml @@ -81,6 +81,10 @@ spec: - name: MKFS_XFS_ARGS value: {{ .Values.csi.node.mkfs_args.xfs | quote }} {{- end }} + {{- if $safeMount := .Values.base.safeMount }} + - name: USE_SAFE_MOUNT + value: {{ $safeMount | quote }} + {{- end }} args: - "--csi-socket={{ default .Values.csi.node.pluginMountPath .Values.csi.node.pluginMounthPath }}/{{ .Values.csi.node.socketPath }}" - "--node-name=$(MY_NODE_NAME)" diff --git a/chart/templates/mayastor/io/io-engine-daemonset.yaml b/chart/templates/mayastor/io/io-engine-daemonset.yaml index b1d859163..17f1a089a 100644 --- a/chart/templates/mayastor/io/io-engine-daemonset.yaml +++ b/chart/templates/mayastor/io/io-engine-daemonset.yaml @@ -86,6 +86,10 @@ spec: value: "1" - name: NEXUS_NVMF_RESV_ENABLE value: "1" + {{- if $safeMount := .Values.base.safeMount }} + - name: USE_SAFE_MOUNT + value: {{ $safeMount | quote }} + {{- end }} args: # The -l argument accepts cpu-list. Indexing starts at zero. # For example -l 1,2,10-20 means use core 1, 2, 10 to 20. diff --git a/dependencies/control-plane b/dependencies/control-plane index 85562edb5..ae1819b77 160000 --- a/dependencies/control-plane +++ b/dependencies/control-plane @@ -1 +1 @@ -Subproject commit 85562edb5fe4651ff554bc12310b2bffa6541ca4 +Subproject commit ae1819b7737c89a947fe4314436a4d3ca7e6789d