diff --git a/README.md b/README.md index 295a3c66..6d11b6f1 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ Please refer to [`nfs.csi.k8s.io` driver parameters](./docs/driver-parameters.md ### Examples - [Basic usage](./deploy/example/README.md) - - [fsGroupPolicy](./deploy/example/fsgroup) ### Troubleshooting - [CSI driver troubleshooting guide](./docs/csi-debug.md) diff --git a/charts/README.md b/charts/README.md index a7c123f6..d1b8d334 100644 --- a/charts/README.md +++ b/charts/README.md @@ -38,7 +38,6 @@ The following table lists the configurable parameters of the latest NFS CSI Driv |---------------------------------------------------|------------------------------------------------------------|-------------------------------------------------------------------| | `driver.name` | alternative driver name | `nfs.csi.k8s.io` | | `driver.mountPermissions` | mounted folder permissions name | `0777` -| `feature.enableFSGroupPolicy` | enable `fsGroupPolicy` on a k8s 1.20+ cluster | `true` | | `feature.enableInlineVolume` | enable inline volume | `false` | | `kubeletDir` | alternative kubelet directory | `/var/lib/kubelet` | | `image.nfs.repository` | csi-driver-nfs image | `registry.k8s.io/sig-storage/nfsplugin` | diff --git a/charts/latest/csi-driver-nfs-v4.1.0.tgz b/charts/latest/csi-driver-nfs-v4.1.0.tgz index e50c9616..0f532336 100644 Binary files a/charts/latest/csi-driver-nfs-v4.1.0.tgz and b/charts/latest/csi-driver-nfs-v4.1.0.tgz differ diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-driverinfo.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-driverinfo.yaml index a6afd896..b23954c9 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-driverinfo.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-driverinfo.yaml @@ -10,6 +10,4 @@ spec: {{- if .Values.feature.enableInlineVolume}} - Ephemeral {{- end}} - {{- if .Values.feature.enableFSGroupPolicy}} - fsGroupPolicy: File - {{- end}} + fsGroupPolicy: ReadWriteOnceWithFSType diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index 4c9acd21..0b7afc76 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -30,7 +30,6 @@ driver: mountPermissions: 0777 feature: - enableFSGroupPolicy: true enableInlineVolume: false kubeletDir: /var/lib/kubelet diff --git a/deploy/csi-nfs-driverinfo.yaml b/deploy/csi-nfs-driverinfo.yaml index bb08dbc4..df348d34 100644 --- a/deploy/csi-nfs-driverinfo.yaml +++ b/deploy/csi-nfs-driverinfo.yaml @@ -8,4 +8,4 @@ spec: volumeLifecycleModes: - Persistent - Ephemeral - fsGroupPolicy: File + fsGroupPolicy: ReadWriteOnceWithFSType diff --git a/deploy/example/fsgroup/README.md b/deploy/example/fsgroup/README.md deleted file mode 100644 index 6c4640b9..00000000 --- a/deploy/example/fsgroup/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# fsGroup Support - -[fsGroupPolicy](https://kubernetes-csi.github.io/docs/support-fsgroup.html) feature is Beta from Kubernetes 1.20, and disabled by default, follow below steps to enable this feature. - -### Option#1: Enable fsGroupPolicy support in [driver helm installation](../../../charts) - -add `--set feature.enableFSGroupPolicy=true` in helm installation command. - -### Option#2: Enable fsGroupPolicy support on a cluster with CSI driver already installed - -```console -kubectl delete CSIDriver nfs.csi.k8s.io -cat <