From f0b51f9f066ff53ae9d0250422eb77768a4baa21 Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Fri, 21 Jan 2022 13:57:17 +0000
Subject: [PATCH] feat: upgrade to csi-provisioner v3.1.0

fix lint
---
 .github/workflows/static.yaml            |   4 ++--
 README.md                                |   2 +-
 charts/README.md                         |   5 ++---
 charts/latest/csi-driver-nfs-v3.2.0.tgz  | Bin 3603 -> 3603 bytes
 charts/latest/csi-driver-nfs/values.yaml |   4 ++--
 deploy/csi-nfs-controller.yaml           |   2 +-
 deploy/csi-nfs-driverinfo.yaml           |   1 +
 test/external-e2e/run.sh                 |   3 +--
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
index 9efaaa44..45c0f6aa 100644
--- a/.github/workflows/static.yaml
+++ b/.github/workflows/static.yaml
@@ -12,8 +12,8 @@ jobs:
             - name: Run linter
               uses: golangci/golangci-lint-action@v2
               with:
-                  version: v1.31
-                  args: -E=gofmt,deadcode,unused,varcheck,ineffassign,golint,misspell --timeout=30m0s
+                  version: v1.43
+                  args: -E=gofmt,deadcode,unused,varcheck,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,contextcheck --timeout=30m0s
     verify-helm:
         name: Verify Helm
         runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index 719b518e..1ca67242 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ This is a repository for [NFS](https://en.wikipedia.org/wiki/Network_File_System
 ### Container Images & Kubernetes Compatibility:
 |driver version  | supported k8s version | status |
 |----------------|-----------------------|--------|
-|master branch   | 1.19+                 | beta   |
+|master branch   | 1.20+                 | beta   |
 |v3.1.0          | 1.19+                 | beta   |
 |v3.0.0          | 1.19+                 | beta   |
 |v2.0.0          | 1.14+                 | alpha  |
diff --git a/charts/README.md b/charts/README.md
index d68d3858..1eb8fed7 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -6,7 +6,6 @@
 ### Tips
  - make controller only run on master node: `--set controller.runOnMaster=true`
  - set replica of controller as `1`: `--set controller.replicas=1`
- - enable `fsGroupPolicy` on a k8s 1.20+ cluster (this feature is in beta, check details [here](../deploy/example/fsgroup)): `--set feature.enableFSGroupPolicy=true`
 
 ### install a specific version
 ```console
@@ -39,13 +38,13 @@ 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              | `false`                      |
+| `feature.enableFSGroupPolicy`                     | enable `fsGroupPolicy` on a k8s 1.20+ cluster              | `true`                      |
 | `feature.enableInlineVolume`                      | enable inline volume                     | `false`                      |
 | `image.nfs.repository`                            | csi-driver-nfs image                                       | `mcr.microsoft.com/k8s/csi/nfs-csi`                          |
 | `image.nfs.tag`                                   | csi-driver-nfs image tag                                   | `latest`                                                |
 | `image.nfs.pullPolicy`                            | csi-driver-nfs image pull policy                           | `IfNotPresent`                                                      |
 | `image.csiProvisioner.repository`                 | csi-provisioner docker image                               | `k8s.gcr.io/sig-storage/csi-provisioner`                            |
-| `image.csiProvisioner.tag`                        | csi-provisioner docker image tag                           | `v2.0.4`                                                            |
+| `image.csiProvisioner.tag`                        | csi-provisioner docker image tag                           | `v3.1.0`                                                            |
 | `image.csiProvisioner.pullPolicy`                 | csi-provisioner image pull policy                          | `IfNotPresent`                                                      |
 | `image.livenessProbe.repository`                  | liveness-probe docker image                                | `k8s.gcr.io/sig-storage/livenessprobe`                              |
 | `image.livenessProbe.tag`                         | liveness-probe docker image tag                            | `v2.5.0`                                                            |
diff --git a/charts/latest/csi-driver-nfs-v3.2.0.tgz b/charts/latest/csi-driver-nfs-v3.2.0.tgz
index 884c816d67e164a54c2fb62d9f5b11d7fe2e89a7..432c07d3650a9ab4bc0aeddc8b08646d1add08d6 100644
GIT binary patch
delta 3555
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

delta 3555
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

diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml
index 4ea1987b..c9c48dcf 100755
--- a/charts/latest/csi-driver-nfs/values.yaml
+++ b/charts/latest/csi-driver-nfs/values.yaml
@@ -5,7 +5,7 @@ image:
         pullPolicy: IfNotPresent
     csiProvisioner:
         repository: k8s.gcr.io/sig-storage/csi-provisioner
-        tag: v2.2.2
+        tag: v3.1.0
         pullPolicy: IfNotPresent
     livenessProbe:
         repository: k8s.gcr.io/sig-storage/livenessprobe
@@ -29,7 +29,7 @@ driver:
   mountPermissions: 0777
 
 feature:
-  enableFSGroupPolicy: false
+  enableFSGroupPolicy: true
   enableInlineVolume: false
 
 controller:
diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml
index b934d13a..00a560b3 100644
--- a/deploy/csi-nfs-controller.yaml
+++ b/deploy/csi-nfs-controller.yaml
@@ -29,7 +29,7 @@ spec:
           effect: "NoSchedule"
       containers:
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
           args:
             - "-v=2"
             - "--csi-address=$(ADDRESS)"
diff --git a/deploy/csi-nfs-driverinfo.yaml b/deploy/csi-nfs-driverinfo.yaml
index 3ac1e317..bb08dbc4 100644
--- a/deploy/csi-nfs-driverinfo.yaml
+++ b/deploy/csi-nfs-driverinfo.yaml
@@ -8,3 +8,4 @@ spec:
   volumeLifecycleModes:
     - Persistent
     - Ephemeral
+  fsGroupPolicy: File
diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh
index d5d0f537..05a8c685 100644
--- a/test/external-e2e/run.sh
+++ b/test/external-e2e/run.sh
@@ -29,8 +29,7 @@ setup_e2e_binaries() {
     curl -sL https://storage.googleapis.com/kubernetes-release/release/v1.23.0/kubernetes-test-linux-amd64.tar.gz --output e2e-tests.tar.gz
     tar -xvf e2e-tests.tar.gz && rm e2e-tests.tar.gz
 
-    # enable fsGroupPolicy (only available from k8s 1.20)
-    export EXTRA_HELM_OPTIONS="--set feature.enableFSGroupPolicy=true --set driver.name=$DRIVER.csi.k8s.io --set controller.name=csi-$DRIVER-controller --set node.name=csi-$DRIVER-node --set image.csiProvisioner.tag=v3.0.0 --set driver.mountPermissions=0777"
+    export EXTRA_HELM_OPTIONS="--set driver.name=$DRIVER.csi.k8s.io --set controller.name=csi-$DRIVER-controller --set node.name=csi-$DRIVER-node"
 
     # test on alternative driver name
     sed -i "s/nfs.csi.k8s.io/$DRIVER.csi.k8s.io/g" deploy/example/storageclass-nfs.yaml