Skip to content

Commit c549431

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request kubernetes-csi#118 from shiftstack/merge-bot-master
Merge https://github.com/kubernetes-csi/csi-driver-nfs:master into master
2 parents 82f1a60 + 02ce99e commit c549431

File tree

390 files changed

+16948
-5556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

390 files changed

+16948
-5556
lines changed

‎.github/dependabot.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: gomod
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
labels:
8+
- "area/dependency"
9+
- "release-note-none"
10+
- "ok-to-test"
11+
open-pull-requests-limit: 1
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"
16+
labels:
17+
- "area/dependency"
18+
- "release-note-none"
19+
- "ok-to-test"
20+
open-pull-requests-limit: 1

‎.github/workflows/codeql-analysis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Set up Go 1.x
41-
uses: actions/setup-go@v2
41+
uses: actions/setup-go@v4
4242
with:
4343
go-version: ^1.18
4444
id: go
@@ -48,7 +48,7 @@ jobs:
4848

4949
# Initializes the CodeQL tools for scanning.
5050
- name: Initialize CodeQL
51-
uses: github/codeql-action/init@v1
51+
uses: github/codeql-action/init@v2
5252
with:
5353
languages: ${{ matrix.language }}
5454
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,4 +63,4 @@ jobs:
6363
make all
6464
6565
- name: Perform CodeQL Analysis
66-
uses: github/codeql-action/analyze@v1
66+
uses: github/codeql-action/analyze@v2

‎.github/workflows/codespell.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Check for spelling errors
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
- uses: codespell-project/actions-codespell@master
1313
with:
1414
check_filenames: true

‎.github/workflows/darwin.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
runs-on: macos-latest
99
steps:
1010
- name: Set up Go 1.x
11-
uses: actions/setup-go@v2
11+
uses: actions/setup-go@v4
1212
with:
1313
go-version: ^1.16
1414
id: go
1515
- name: Check out code into the Go module directory
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
- name: Run unit tests
1818
run: |
1919
go version

‎.github/workflows/linux.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
steps:
1212

1313
- name: Set up Go 1.x
14-
uses: actions/setup-go@v2
14+
uses: actions/setup-go@v4
1515
with:
1616
go-version: ^1.17
1717
id: go
1818

1919
- name: Check out code into the Go module directory
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Build Test
2323
run: |

‎.github/workflows/pluto.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212

1313
- name: Checkout
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515

1616
# https://pluto.docs.fairwinds.com/advanced/#display-options
1717
- name: Download pluto

‎.github/workflows/shellcheck.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Shellcheck
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: Run ShellCheck
2121
uses: ludeeus/action-shellcheck@master
2222
env:

‎.github/workflows/static.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Set up Go 1.x
11-
uses: actions/setup-go@v3
11+
uses: actions/setup-go@v4
1212
with:
1313
go-version: ^1.19
1414
- uses: actions/checkout@master

‎.github/workflows/trivy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v3
1414

1515
- name: Install go
16-
uses: actions/setup-go@v3
16+
uses: actions/setup-go@v4
1717
with:
1818
go-version: ^1.19
1919

‎.github/workflows/windows.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ${{ matrix.platform }}
1212
steps:
1313
- name: Install Go
14-
uses: actions/setup-go@v2
14+
uses: actions/setup-go@v4
1515
with:
1616
go-version: ${{ matrix.go }}
1717
- name: Checkout code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919
- name: Run Windows Unit Tests
2020
run: |
2121
go version

‎Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ include release-tools/build.make
2727

2828
GIT_COMMIT = $(shell git rev-parse HEAD)
2929
BUILD_DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
30-
IMAGE_VERSION ?= v4.2.0
30+
IMAGE_VERSION ?= v4.4.0
3131
LDFLAGS = -X ${PKG}/pkg/nfs.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/nfs.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/nfs.buildDate=${BUILD_DATE}
3232
EXT_LDFLAGS = -s -w -extldflags "-static"
3333
# Use a custom version for E2E tests if we are testing in CI
@@ -147,7 +147,6 @@ e2e-bootstrap: install-helm
147147
OUTPUT_TYPE=registry $(MAKE) container push
148148
helm install csi-driver-nfs ./charts/latest/csi-driver-nfs --namespace kube-system --wait --timeout=15m -v=5 --debug \
149149
${E2E_HELM_OPTIONS} \
150-
--set controller.dnsPolicy=ClusterFirstWithHostNet \
151150
--set controller.logLevel=8 \
152151
--set node.logLevel=8
153152

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This is a repository for [NFS](https://en.wikipedia.org/wiki/Network_File_System
1212
|driver version | supported k8s version | status |
1313
|----------------|-----------------------|--------|
1414
|master branch | 1.21+ | GA |
15+
|v4.4.0 | 1.21+ | GA |
16+
|v4.3.0 | 1.21+ | GA |
1517
|v4.2.0 | 1.21+ | GA |
16-
|v4.1.0 | 1.20+ | GA |
17-
|v4.0.0 | 1.20+ | GA |
1818

1919
### Install driver on a Kubernetes cluster
2020
> [install NFS CSI driver on microk8s](https://microk8s.io/docs/nfs)

‎charts/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
### install a specific version
1616
```console
1717
helm repo add csi-driver-nfs https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts
18-
helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.2.0
18+
helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.4.0
1919
```
2020

2121
### install driver with customized driver name, deployment name
@@ -51,21 +51,21 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
5151
| `image.nfs.tag` | csi-driver-nfs image tag | `latest` |
5252
| `image.nfs.pullPolicy` | csi-driver-nfs image pull policy | `IfNotPresent` |
5353
| `image.csiProvisioner.repository` | csi-provisioner docker image | `registry.k8s.io/sig-storage/csi-provisioner` |
54-
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.3.0` |
54+
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.5.0` |
5555
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
5656
| `image.livenessProbe.repository` | liveness-probe docker image | `registry.k8s.io/sig-storage/livenessprobe` |
57-
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.8.0` |
57+
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.10.0` |
5858
| `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` |
5959
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
60-
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.6.2` |
60+
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.8.0` |
6161
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` |
6262
| `imagePullSecrets` | Specify docker-registry secret names as an array | [] (does not add image pull secrets to deployed pods) |
6363
| `serviceAccount.create` | whether create service account of csi-nfs-controller | `true` |
6464
| `rbac.create` | whether create rbac of csi-nfs-controller | `true` |
6565
| `controller.replicas` | replica number of csi-nfs-controller | `1` |
6666
| `controller.runOnMaster` | run controller on master node(deprecated on k8s 1.25+) |`false` |
6767
| `controller.runOnControlPlane` | run controller on control plane node |`false` |
68-
| `controller.dnsPolicy` | dnsPolicy of controller driver, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `Default` |
68+
| `controller.dnsPolicy` | dnsPolicy of controller driver, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `ClusterFirstWithHostNet` |
6969
| `controller.defaultOnDeletePolicy` | default policy for deleting subdirectory when deleting a volume, available values: `delete`, `retain` | `delete` |
7070
| `controller.logLevel` | controller driver log level |`5` |
7171
| `controller.workingMountDir` | working directory for provisioner to mount nfs shares temporarily | `/tmp` |
@@ -82,7 +82,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
8282
| `controller.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m |
8383
| `controller.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi |
8484
| `node.name` | driver node daemonset name | `csi-nfs-node`
85-
| `node.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` |
85+
| `node.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` |`ClusterFirstWithHostNet`
8686
| `node.maxUnavailable` | `maxUnavailable` value of driver node daemonset | `1`
8787
| `node.logLevel` | node driver log level |`5` |
8888
| `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` |

‎charts/index.yaml

+27-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
11
apiVersion: v1
22
entries:
33
csi-driver-nfs:
4+
- apiVersion: v1
5+
appVersion: v4.4.0
6+
created: "2023-06-07T08:29:18.915849236Z"
7+
description: CSI NFS Driver for Kubernetes
8+
digest: 8433b702987079bd2209921e22db7b038bfff760d50b85755e72684ee6c60721
9+
name: csi-driver-nfs
10+
urls:
11+
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.4.0/csi-driver-nfs-v4.4.0.tgz
12+
version: v4.4.0
13+
- apiVersion: v1
14+
appVersion: v4.3.0
15+
created: "2023-06-07T08:29:18.915120822Z"
16+
description: CSI NFS Driver for Kubernetes
17+
digest: 1aef5dec52a6c433dbed2e361bed0ab1fdd6792f845eccb99b7dc7f193c2a71e
18+
name: csi-driver-nfs
19+
urls:
20+
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.3.0/csi-driver-nfs-v4.3.0.tgz
21+
version: v4.3.0
422
- apiVersion: v1
523
appVersion: v4.2.0
6-
created: "2023-02-19T03:06:17.779651726Z"
24+
created: "2023-06-07T08:29:18.91443514Z"
725
description: CSI NFS Driver for Kubernetes
826
digest: e702f6c9be35f2649f5736ca5fcdc40ab1c6a235f41e7fb2472d208e8a5ebf47
927
name: csi-driver-nfs
@@ -12,7 +30,7 @@ entries:
1230
version: v4.2.0
1331
- apiVersion: v1
1432
appVersion: v4.1.0
15-
created: "2023-02-19T03:06:17.779230713Z"
33+
created: "2023-06-07T08:29:18.913997153Z"
1634
description: CSI NFS Driver for Kubernetes
1735
digest: b2baa2f129976cf2981c8873290aac509aa3c5937ffc319fbf69fbe3271c23eb
1836
name: csi-driver-nfs
@@ -21,7 +39,7 @@ entries:
2139
version: v4.1.0
2240
- apiVersion: v1
2341
appVersion: v4.0.0
24-
created: "2023-02-19T03:06:17.778817545Z"
42+
created: "2023-06-07T08:29:18.913508212Z"
2543
description: CSI NFS Driver for Kubernetes
2644
digest: 3145fd12225a639908b14675c8ae1f272bc0e57ffa2895b6f17411486a24229d
2745
name: csi-driver-nfs
@@ -30,7 +48,7 @@ entries:
3048
version: v4.0.0
3149
- apiVersion: v1
3250
appVersion: v3.1.0
33-
created: "2023-02-19T03:06:17.778410591Z"
51+
created: "2023-06-07T08:29:18.913089943Z"
3452
description: CSI NFS Driver for Kubernetes
3553
digest: 7e51bb9188b013195cafc265102fa365de9ec5513780e1dfc5363289f811a4d9
3654
name: csi-driver-nfs
@@ -39,7 +57,7 @@ entries:
3957
version: v3.1.0
4058
- apiVersion: v1
4159
appVersion: v3.0.0
42-
created: "2023-02-19T03:06:17.778027388Z"
60+
created: "2023-06-07T08:29:18.912648344Z"
4361
description: CSI NFS Driver for Kubernetes
4462
digest: 44406231cd5cdada1c62a0541b93b4f5d5a70ccc8c50b33553a8692fe6cfae96
4563
name: csi-driver-nfs
@@ -48,7 +66,7 @@ entries:
4866
version: v3.0.0
4967
- apiVersion: v1
5068
appVersion: v2.0.0
51-
created: "2023-02-19T03:06:17.777605366Z"
69+
created: "2023-06-07T08:29:18.911647961Z"
5270
description: CSI NFS Driver for Kubernetes
5371
digest: 1a32c6fc016526fe19a0c9e0dfbe83d0ddde67ced533bb5f5d24d713f706c613
5472
name: csi-driver-nfs
@@ -57,11 +75,11 @@ entries:
5775
version: v2.0.0
5876
- apiVersion: v1
5977
appVersion: latest
60-
created: "2023-02-19T03:06:17.777385954Z"
78+
created: "2023-06-07T08:29:18.91113186Z"
6179
description: CSI NFS Driver for Kubernetes
62-
digest: 16549e803dcdcf624e6dffeaff63cea7cfde0447651cc188060d5f2801f21c9f
80+
digest: 7e41d0f60dce722ae616b9caf8999d8271750b1a762c809ef1929f57756d2f3f
6381
name: csi-driver-nfs
6482
urls:
6583
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/latest/csi-driver-nfs-v0.0.0.tgz
6684
version: v0.0.0
67-
generated: "2023-02-19T03:06:17.776802428Z"
85+
generated: "2023-06-07T08:29:18.910267239Z"

‎charts/latest/csi-driver-nfs-v0.0.0.tgz

6.73 KB
Binary file not shown.

0 commit comments

Comments
 (0)