dont clear default mountOpts

truenas · Jan 11, 2024 · 17602e4 · 17602e4
1 parent fd2922d
commit 17602e4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/library/common/templates/app_functions/_storageEntry.tpl b/library/common/templates/app_functions/_storageEntry.tpl
@@ -59,7 +59,9 @@
     {{- $domain = $storage.smbConfig.domain | quote -}}
     {{- $username = $storage.smbConfig.username | quote -}}
     {{- $password = $storage.smbConfig.password | quote -}}
-    {{- $mountOpts = $storage.smbConfig.mountOptions -}}
+    {{- if $storage.smbConfig.mountOptions -}}
+      {{- $mountOpts = $storage.smbConfig.mountOptions -}}
+    {{- end -}}
     {{- if $storage.smbConfig.size -}}
       {{- $size = (printf "%vGi" $storage.smbConfig.size) -}}
     {{- end -}}

diff --git a/library/ix-dev/test/syncthing/charts/common-1.2.8.tgz b/library/ix-dev/test/syncthing/charts/common-1.2.8.tgz
diff --git a/library/ix-dev/test/syncthing/ci/basic-values.yaml b/library/ix-dev/test/syncthing/ci/basic-values.yaml
@@ -8,15 +8,6 @@ syncthingStorage:
       mountPath: /mnt/dir2
     - type: pvc
       mountPath: /mnt/dir3
-    - type: "smb-pv-pvc"
-      mountPath: /mnt/dir4
-      smbConfig:
-        server: "asdf"
-        share: "asdf"
-        username: "asdf"
-        password: "asdf"
-        domain: "asdf"
-
 
 syncthingID:
   user: 1001

diff --git a/library/ix-dev/test/syncthing/templates/_persistence.tpl b/library/ix-dev/test/syncthing/templates/_persistence.tpl
@@ -36,7 +36,7 @@ persistence:
 
   {{- range $idx, $storage := .Values.syncthingStorage.additionalStorages }}
   {{- if eq $storage.type "smb-pv-pvc" -}}
-    {{- if $storage.migrationMode -}}
+    {{- if $storage.smbConfig.migrationMode -}}
       {{- $_ := set $storage "readOnly" true -}}
       {{- $_ := set $storage.smbConfig "mountOptions" (list
         (dict "key" "noperm")