kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: upgrade to csi-provisioner v3.1.0

Browse Source 
fix lint
This commit is contained in:
andyzhangx 2022-01-21 13:57:17 +00:00
parent 29f99a15d3
commit f0b51f9f06
8 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/static.yaml vendored
View File

@ -12,8 +12,8 @@ jobs:
- name: Run linter - name: Run linter
uses: golangci/golangci-lint-action@v2 uses: golangci/golangci-lint-action@v2
with: with:
version: v1.31 version: v1.43
args: -E=gofmt,deadcode,unused,varcheck,ineffassign,golint,misspell --timeout=30m0s args: -E=gofmt,deadcode,unused,varcheck,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,contextcheck --timeout=30m0s
verify-helm: verify-helm:
name: Verify Helm name: Verify Helm
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
README.md
View File

@ -10,7 +10,7 @@ This is a repository for [NFS](https://en.wikipedia.org/wiki/Network_File_System
### Container Images & Kubernetes Compatibility: ### Container Images & Kubernetes Compatibility:
|driver version | supported k8s version | status | |driver version | supported k8s version | status |
|----------------|-----------------------|--------| |----------------|-----------------------|--------|
|master branch | 1.19+ | beta | |master branch | 1.20+ | beta |
|v3.1.0 | 1.19+ | beta | |v3.1.0 | 1.19+ | beta |
|v3.0.0 | 1.19+ | beta | |v3.0.0 | 1.19+ | beta |
|v2.0.0 | 1.14+ | alpha | |v2.0.0 | 1.14+ | alpha |

5
charts/README.md
View File

@ -6,7 +6,6 @@
### Tips ### Tips
- make controller only run on master node: `--set controller.runOnMaster=true` - make controller only run on master node: `--set controller.runOnMaster=true`
- set replica of controller as `1`: `--set controller.replicas=1` - 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 ### install a specific version
```console ```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.name` | alternative driver name | `nfs.csi.k8s.io` |
| `driver.mountPermissions` | mounted folder permissions name | `0777` | `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` | | `feature.enableInlineVolume` | enable inline volume | `false` |
| `image.nfs.repository` | csi-driver-nfs image | `mcr.microsoft.com/k8s/csi/nfs-csi` | | `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.tag` | csi-driver-nfs image tag | `latest` |
| `image.nfs.pullPolicy` | csi-driver-nfs image pull policy | `IfNotPresent` | | `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.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.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
| `image.livenessProbe.repository` | liveness-probe docker image | `k8s.gcr.io/sig-storage/livenessprobe` | | `image.livenessProbe.repository` | liveness-probe docker image | `k8s.gcr.io/sig-storage/livenessprobe` |
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.5.0` | | `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.5.0` |

BIN
charts/latest/csi-driver-nfs-v3.2.0.tgz
View File

Binary file not shown.

4
charts/latest/csi-driver-nfs/values.yaml
View File

@ -5,7 +5,7 @@ image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
csiProvisioner: csiProvisioner:
repository: k8s.gcr.io/sig-storage/csi-provisioner repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: v2.2.2 tag: v3.1.0
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
livenessProbe: livenessProbe:
repository: k8s.gcr.io/sig-storage/livenessprobe repository: k8s.gcr.io/sig-storage/livenessprobe
@ -29,7 +29,7 @@ driver:
mountPermissions: 0777 mountPermissions: 0777
feature: feature:
enableFSGroupPolicy: false enableFSGroupPolicy: true
enableInlineVolume: false enableInlineVolume: false
controller: controller:

2
deploy/csi-nfs-controller.yaml
View File

@ -29,7 +29,7 @@ spec:
effect: "NoSchedule" effect: "NoSchedule"
containers: containers:
- name: csi-provisioner - 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: args:
- "-v=2" - "-v=2"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"

1
deploy/csi-nfs-driverinfo.yaml
View File

@ -8,3 +8,4 @@ spec:
volumeLifecycleModes: volumeLifecycleModes:
- Persistent - Persistent
- Ephemeral - Ephemeral
fsGroupPolicy: File

3
test/external-e2e/run.sh
View File

@ -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 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 tar -xvf e2e-tests.tar.gz && rm e2e-tests.tar.gz
# enable fsGroupPolicy (only available from k8s 1.20) export EXTRA_HELM_OPTIONS="--set driver.name=$DRIVER.csi.k8s.io --set controller.name=csi-$DRIVER-controller --set node.name=csi-$DRIVER-node"
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"
# test on alternative driver name # test on alternative driver name
sed -i "s/nfs.csi.k8s.io/$DRIVER.csi.k8s.io/g" deploy/example/storageclass-nfs.yaml sed -i "s/nfs.csi.k8s.io/$DRIVER.csi.k8s.io/g" deploy/example/storageclass-nfs.yaml