Merge pull request #918 from andyzhangx/fsGroupPolicy

feat: add fsGroupPolicy parameter in helm chart

Author: andyzhangx

charts/README.md

@@ -59,7 +59,7 @@ The following table lists the configurable parameters of the latest Azure Blob S
 | `driver.customUserAgent`                              | custom userAgent                                      | `` |
 | `driver.userAgentSuffix`                              | userAgent suffix                                      | `OSS-helm` |
 | `driver.azureGoSDKLogLevel`                           | [Azure go sdk log level](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/previous-versions-quickstart.md#built-in-basic-requestresponse-logging)  | ``(no logs), `DEBUG`, `INFO`, `WARNING`, `ERROR`, [etc](https://github.com/Azure/go-autorest/blob/50e09bb39af124f28f29ba60efde3fa74a4fe93f/logger/logger.go#L65-L73) |
-| `feature.enableFSGroupPolicy`                         | enable `fsGroupPolicy` on a k8s 1.20+ cluster         | `false`                      |
+| `feature.fsGroupPolicy`                               | CSIDriver FSGroupPolicy value                  | `ReadWriteOnceWithFSType`(available values: `ReadWriteOnceWithFSType`, `File`, `None`) |
 | `feature.enableGetVolumeStats`                        | allow GET_VOLUME_STATS on agent node                  | `false`                      |
 | `image.baseRepo`                                      | base repository of driver images                      | `mcr.microsoft.com`                      |
 | `image.blob.repository`                               | blob-csi-driver docker image                          | `mcr.microsoft.com/oss/kubernetes-csi/blob-csi`                             |

charts/latest/blob-csi-driver-v0.0.0.tgz

@@ -8,9 +8,7 @@ metadata:
 spec:
   attachRequired: false
   podInfoOnMount: true
-  {{- if .Values.feature.enableFSGroupPolicy}}
-  fsGroupPolicy: File
-  {{- end}}
+  fsGroupPolicy: {{ .Values.feature.fsGroupPolicy }}
   volumeLifecycleModes:
     - Persistent
     - Ephemeral

charts/latest/blob-csi-driver/templates/csi-blob-driver.yaml

@@ -151,7 +151,7 @@ node:
     - operator: "Exists"
 
 feature:
-  enableFSGroupPolicy: false
+  fsGroupPolicy: ReadWriteOnceWithFSType
   enableGetVolumeStats: false
 
 driver:

charts/latest/blob-csi-driver/values.yaml

@@ -6,6 +6,7 @@ metadata:
 spec:
   attachRequired: false
   podInfoOnMount: true
+  fsGroupPolicy: ReadWriteOnceWithFSType
   volumeLifecycleModes:
     - Persistent
     - Ephemeral

deploy/csi-blob-driver.yaml

@@ -4,7 +4,7 @@
 
 ### Option#1: Enable fsGroupPolicy support in [driver helm installation](../../../charts)
 
-add `--set feature.enableFSGroupPolicy=true` in helm installation command.
+add `--set feature.fsGroupPolicy=File` in helm installation command.
 
 ### Option#2: Enable fsGroupPolicy support on a cluster with CSI driver already installed
 

deploy/example/fsgroup/README.md

@@ -27,7 +27,7 @@ setup_e2e_binaries() {
     export EXTRA_HELM_OPTIONS="--set driver.name=$DRIVER.csi.azure.com --set controller.name=csi-$DRIVER-controller --set node.name=csi-$DRIVER-node --set driver.azureGoSDKLogLevel=INFO"
     if [ ! -z ${EXTERNAL_E2E_TEST_NFS} ]; then
         # enable fsGroupPolicy (only available from k8s 1.20)
-        export EXTRA_HELM_OPTIONS=$EXTRA_HELM_OPTIONS" --set feature.enableFSGroupPolicy=true"
+        export EXTRA_HELM_OPTIONS=$EXTRA_HELM_OPTIONS" --set feature.fsGroupPolicy=File"
     fi
 
      # test on alternative driver name