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 884c816d..432c07d3 100644 Binary files a/charts/latest/csi-driver-nfs-v3.2.0.tgz and b/charts/latest/csi-driver-nfs-v3.2.0.tgz differ 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