From e960cf4b6d90908b229c435d10e2542e22e2d4eb Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Thu, 5 May 2022 16:42:06 -0600
Subject: [PATCH] use id instead of names for user/group in ci configs

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
---
 ci/configs/client/nfs.yaml      | 4 ++--
 ci/configs/client/smb.yaml      | 8 ++++++--
 ci/configs/zfs-generic/nfs.yaml | 3 ++-
 examples/local-hostpath.yaml    | 4 ++--
 examples/zfs-generic-nfs.yaml   | 5 +++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ci/configs/client/nfs.yaml b/ci/configs/client/nfs.yaml
index a3a6f5e..b277805 100644
--- a/ci/configs/client/nfs.yaml
+++ b/ci/configs/client/nfs.yaml
@@ -6,5 +6,5 @@ nfs:
   # shareHost:shareBasePath should be mounted at this location in the controller container
   controllerBasePath: "/mnt/client/nfs/${CI_BUILD_KEY}"
   dirPermissionsMode: "0777"
-  dirPermissionsUser: root
-  dirPermissionsGroup: wheel
+  dirPermissionsUser: 0
+  dirPermissionsGroup: 0
diff --git a/ci/configs/client/smb.yaml b/ci/configs/client/smb.yaml
index 8ce57c0..485a782 100644
--- a/ci/configs/client/smb.yaml
+++ b/ci/configs/client/smb.yaml
@@ -6,5 +6,9 @@ smb:
   # shareHost:shareBasePath should be mounted at this location in the controller container
   controllerBasePath: "/mnt/client/smb/${CI_BUILD_KEY}"
   dirPermissionsMode: "0777"
-  dirPermissionsUser: root
-  dirPermissionsGroup: wheel
+  dirPermissionsUser: 0
+  dirPermissionsGroup: 0
+
+node:
+  mount:
+    mount_flags: "username=smbroot,password=smbroot"
diff --git a/ci/configs/zfs-generic/nfs.yaml b/ci/configs/zfs-generic/nfs.yaml
index e451a73..46acf25 100644
--- a/ci/configs/zfs-generic/nfs.yaml
+++ b/ci/configs/zfs-generic/nfs.yaml
@@ -21,4 +21,5 @@ nfs:
   shareStrategy: "setDatasetProperties"
   shareStrategySetDatasetProperties:
     properties:
-      sharenfs: "on"
+      #sharenfs: "on"
+      sharenfs: "rw,no_subtree_check,no_root_squash"
diff --git a/examples/local-hostpath.yaml b/examples/local-hostpath.yaml
index 7470f95..4c4a9ed 100644
--- a/examples/local-hostpath.yaml
+++ b/examples/local-hostpath.yaml
@@ -6,5 +6,5 @@ local-hostpath:
   shareBasePath:      "/var/lib/csi-local-hostpath"
   controllerBasePath: "/var/lib/csi-local-hostpath"
   dirPermissionsMode: "0777"
-  dirPermissionsUser: root
-  dirPermissionsGroup: root
+  dirPermissionsUser: 0
+  dirPermissionsGroup: 0
diff --git a/examples/zfs-generic-nfs.yaml b/examples/zfs-generic-nfs.yaml
index 54cc8d9..e068c29 100644
--- a/examples/zfs-generic-nfs.yaml
+++ b/examples/zfs-generic-nfs.yaml
@@ -36,8 +36,8 @@ zfs:
   datasetEnableQuotas: true
   datasetEnableReservation: false
   datasetPermissionsMode: "0777"
-  datasetPermissionsUser: root
-  datasetPermissionsGroup: root
+  datasetPermissionsUser: 0
+  datasetPermissionsGroup: 0
   #datasetPermissionsAcls:
   #- "-m everyone@:full_set:allow"
   #- "-m u:kube:full_set:allow"
@@ -48,6 +48,7 @@ nfs:
   shareStrategy: "setDatasetProperties"
   shareStrategySetDatasetProperties:
     properties:
+      #sharenfs: "rw,no_subtree_check,no_root_squash"
       sharenfs: "on"
       # share: ""
   shareHost: "server address"