Skip to content

Commit 2b6f548

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#147 from shiftstack/sync-master
NO-JIRA: Merge https://github.com/kubernetes-csi/csi-driver-nfs:master into master
2 parents 432047c + f8016fe commit 2b6f548

File tree

459 files changed

+14258
-15830
lines changed

Some content is hidden

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

459 files changed

+14258
-15830
lines changed

‎.github/workflows/static.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Run linter
1616
uses: golangci/golangci-lint-action@v6
1717
with:
18-
version: v1.54
18+
version: v1.60
1919
args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,contextcheck --timeout=30m0s
2020
verify-helm:
2121
name: Verify Helm

‎.github/workflows/trivy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Install go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.22.4
18+
go-version: 1.23.1
1919

2020
- name: Build an image from Dockerfile
2121
run: |

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.0
15+
FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
1616

1717
ARG ARCH
1818
ARG binary=./bin/${ARCH}/nfsplugin

‎Makefile‎

Lines changed: 3 additions & 3 deletions
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.7.0
30+
IMAGE_VERSION ?= v4.9.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
@@ -131,8 +131,8 @@ endif
131131
.PHONY: install-nfs-server
132132
install-nfs-server:
133133
kubectl apply -f ./deploy/example/nfs-provisioner/nfs-server.yaml
134-
kubectl delete secret mount-options --ignore-not-found
135-
kubectl create secret generic mount-options --from-literal mountOptions="nfsvers=4.1"
134+
kubectl delete secret mount-options -n default --ignore-not-found
135+
kubectl create secret generic mount-options --from-literal mountOptions="nfsvers=4.1" -n default
136136

137137
.PHONY: install-helm
138138
install-helm:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ This is a repository for [NFS](https://en.wikipedia.org/wiki/Network_File_System
1313
|driver version | supported k8s version | status |
1414
|----------------|-----------------------|--------|
1515
|master branch | 1.21+ | GA |
16+
|v4.9.0 | 1.21+ | GA |
17+
|v4.8.0 | 1.21+ | GA |
1618
|v4.7.0 | 1.21+ | GA |
17-
|v4.6.0 | 1.21+ | GA |
18-
|v4.5.0 | 1.21+ | GA |
1919

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

‎charts/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
### install a specific version
1717
```console
1818
helm repo add csi-driver-nfs https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts
19-
helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.7.0
19+
helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.9.0
2020
```
2121

2222
### install driver with customized driver name, deployment name
@@ -53,13 +53,13 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
5353
| `image.nfs.tag` | csi-driver-nfs image tag | `latest` |
5454
| `image.nfs.pullPolicy` | csi-driver-nfs image pull policy | `IfNotPresent` |
5555
| `image.csiProvisioner.repository` | csi-provisioner docker image | `registry.k8s.io/sig-storage/csi-provisioner` |
56-
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v4.0.0` |
56+
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v5.1.0` |
5757
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
5858
| `image.livenessProbe.repository` | liveness-probe docker image | `registry.k8s.io/sig-storage/livenessprobe` |
59-
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.12.0` |
59+
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.14.0` |
6060
| `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` |
6161
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
62-
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.10.0` |
62+
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.12.0` |
6363
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` |
6464
| `imagePullSecrets` | Specify docker-registry secret names as an array | [] (does not add image pull secrets to deployed pods) |
6565
| `serviceAccount.create` | whether create service account of csi-nfs-controller | `true` |

‎charts/index.yaml‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,72 @@
11
apiVersion: v1
22
entries:
33
csi-driver-nfs:
4+
- apiVersion: v1
5+
appVersion: v4.9.0
6+
created: "2024-09-01T13:43:08.057021276Z"
7+
description: CSI NFS Driver for Kubernetes
8+
digest: ad8815f634a482daaa37827480ed0d01ef4a1311d06ef51f2ef99dc010ce98b2
9+
name: csi-driver-nfs
10+
urls:
11+
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.9.0/csi-driver-nfs-v4.9.0.tgz
12+
version: v4.9.0
13+
- apiVersion: v1
14+
appVersion: v4.8.0
15+
created: "2024-09-01T13:43:08.056273832Z"
16+
description: CSI NFS Driver for Kubernetes
17+
digest: 6bcfc35f85ff56c20c464392e914c37818bc67b54f241f7c683bf6a2b5a675f7
18+
name: csi-driver-nfs
19+
urls:
20+
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.8.0/csi-driver-nfs-v4.8.0.tgz
21+
version: v4.8.0
422
- apiVersion: v1
523
appVersion: v4.7.0
6-
created: "2024-05-04T07:52:10.41923332Z"
24+
created: "2024-09-01T13:43:08.055532971Z"
725
description: CSI NFS Driver for Kubernetes
8-
digest: 9e87ca638633ab55d8f5a1a7a81d3888f712b02628a9817fcbb898750b94346a
26+
digest: b629c5fa9543223339952d9f7c478189c2e8f8695846f513b8d2a45ded7a5ac9
927
name: csi-driver-nfs
1028
urls:
1129
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.7.0/csi-driver-nfs-v4.7.0.tgz
1230
version: v4.7.0
1331
- apiVersion: v1
1432
appVersion: v4.6.0
15-
created: "2024-05-04T07:52:10.41839672Z"
33+
created: "2024-09-01T13:43:08.054774285Z"
1634
description: CSI NFS Driver for Kubernetes
17-
digest: fc252e16ce6c27a5090b73f4d4368674c768b48c289eea5904f5369082d8cab3
35+
digest: c641e8ac0f86b631f07109c10e78c6aa893f57281c7bda595a78651e382e8648
1836
name: csi-driver-nfs
1937
urls:
2038
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz
2139
version: v4.6.0
2240
- apiVersion: v1
2341
appVersion: v4.5.0
24-
created: "2024-05-04T07:52:10.416791983Z"
42+
created: "2024-09-01T13:43:08.054010238Z"
2543
description: CSI NFS Driver for Kubernetes
26-
digest: 26af231cea7696104e87749bd74664404e32885e7a5a9e6fa81c19c4ec0c31fc
44+
digest: 3d170cecde5a71fdf02b86c4c375b7818787c39311938e36199fb3e7a2d5162d
2745
name: csi-driver-nfs
2846
urls:
2947
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.5.0/csi-driver-nfs-v4.5.0.tgz
3048
version: v4.5.0
3149
- apiVersion: v1
3250
appVersion: v4.4.0
33-
created: "2024-05-04T07:52:10.41597809Z"
51+
created: "2024-09-01T13:43:08.052423836Z"
3452
description: CSI NFS Driver for Kubernetes
35-
digest: 7fba8cbfc47036a0fddadad00ee291c625e359fe1483ef37b57fd09d157c80dd
53+
digest: edb60e4ae8b0f94457d1425834567c0bd25ad4d63d30cf9400e71650279edca3
3654
name: csi-driver-nfs
3755
urls:
3856
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.4.0/csi-driver-nfs-v4.4.0.tgz
3957
version: v4.4.0
4058
- apiVersion: v1
4159
appVersion: v4.3.0
42-
created: "2024-05-04T07:52:10.415277659Z"
60+
created: "2024-09-01T13:43:08.051682677Z"
4361
description: CSI NFS Driver for Kubernetes
44-
digest: 1aef5dec52a6c433dbed2e361bed0ab1fdd6792f845eccb99b7dc7f193c2a71e
62+
digest: 84202da067ec3672e75c41bbfd78e9cc95bc3bb81652ef68b84f71ee8a1b8f52
4563
name: csi-driver-nfs
4664
urls:
4765
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.3.0/csi-driver-nfs-v4.3.0.tgz
4866
version: v4.3.0
4967
- apiVersion: v1
5068
appVersion: v4.2.0
51-
created: "2024-05-04T07:52:10.414529394Z"
69+
created: "2024-09-01T13:43:08.050986928Z"
5270
description: CSI NFS Driver for Kubernetes
5371
digest: e702f6c9be35f2649f5736ca5fcdc40ab1c6a235f41e7fb2472d208e8a5ebf47
5472
name: csi-driver-nfs
@@ -57,7 +75,7 @@ entries:
5775
version: v4.2.0
5876
- apiVersion: v1
5977
appVersion: v4.1.0
60-
created: "2024-05-04T07:52:10.414063522Z"
78+
created: "2024-09-01T13:43:08.050516086Z"
6179
description: CSI NFS Driver for Kubernetes
6280
digest: b2baa2f129976cf2981c8873290aac509aa3c5937ffc319fbf69fbe3271c23eb
6381
name: csi-driver-nfs
@@ -66,7 +84,7 @@ entries:
6684
version: v4.1.0
6785
- apiVersion: v1
6886
appVersion: v4.0.0
69-
created: "2024-05-04T07:52:10.413618736Z"
87+
created: "2024-09-01T13:43:08.05009261Z"
7088
description: CSI NFS Driver for Kubernetes
7189
digest: 3145fd12225a639908b14675c8ae1f272bc0e57ffa2895b6f17411486a24229d
7290
name: csi-driver-nfs
@@ -75,7 +93,7 @@ entries:
7593
version: v4.0.0
7694
- apiVersion: v1
7795
appVersion: v3.1.0
78-
created: "2024-05-04T07:52:10.413183476Z"
96+
created: "2024-09-01T13:43:08.049658627Z"
7997
description: CSI NFS Driver for Kubernetes
8098
digest: 7e51bb9188b013195cafc265102fa365de9ec5513780e1dfc5363289f811a4d9
8199
name: csi-driver-nfs
@@ -84,7 +102,7 @@ entries:
84102
version: v3.1.0
85103
- apiVersion: v1
86104
appVersion: v3.0.0
87-
created: "2024-05-04T07:52:10.412773905Z"
105+
created: "2024-09-01T13:43:08.0492145Z"
88106
description: CSI NFS Driver for Kubernetes
89107
digest: 44406231cd5cdada1c62a0541b93b4f5d5a70ccc8c50b33553a8692fe6cfae96
90108
name: csi-driver-nfs
@@ -93,7 +111,7 @@ entries:
93111
version: v3.0.0
94112
- apiVersion: v1
95113
appVersion: v2.0.0
96-
created: "2024-05-04T07:52:10.412366016Z"
114+
created: "2024-09-01T13:43:08.048792062Z"
97115
description: CSI NFS Driver for Kubernetes
98116
digest: 1a32c6fc016526fe19a0c9e0dfbe83d0ddde67ced533bb5f5d24d713f706c613
99117
name: csi-driver-nfs
@@ -102,11 +120,11 @@ entries:
102120
version: v2.0.0
103121
- apiVersion: v1
104122
appVersion: latest
105-
created: "2024-05-04T07:52:10.412128236Z"
123+
created: "2024-09-01T13:43:08.04854528Z"
106124
description: CSI NFS Driver for Kubernetes
107-
digest: 70e0ebd32f024eed91438aecf7df61a994c4037851ba66483a9e2eab29c7168e
125+
digest: 1850c4492caaead20c9049fba0d48ce50f2e96a4dca925a99df5b8a390c04053
108126
name: csi-driver-nfs
109127
urls:
110128
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/latest/csi-driver-nfs-v0.0.0.tgz
111129
version: v0.0.0
112-
generated: "2024-05-04T07:52:10.411193534Z"
130+
generated: "2024-09-01T13:43:08.047626652Z"

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

74 Bytes
Binary file not shown.

‎charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ spec:
6060
- "--leader-election"
6161
- "--leader-election-namespace={{ .Release.Namespace }}"
6262
- "--extra-create-metadata=true"
63+
- "--feature-gates=HonorPVReclaimPolicy=true"
6364
- "--timeout=1200s"
6465
env:
6566
- name: ADDRESS
@@ -71,6 +72,9 @@ spec:
7172
resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }}
7273
securityContext:
7374
readOnlyRootFilesystem: true
75+
capabilities:
76+
drop:
77+
- ALL
7478
- name: csi-snapshotter
7579
{{- if hasPrefix "/" .Values.image.csiSnapshotter.repository }}
7680
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiSnapshotter.repository }}:{{ .Values.image.csiSnapshotter.tag }}"
@@ -91,6 +95,10 @@ spec:
9195
volumeMounts:
9296
- name: socket-dir
9397
mountPath: /csi
98+
securityContext:
99+
capabilities:
100+
drop:
101+
- ALL
94102
- name: liveness-probe
95103
{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
96104
image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
@@ -109,6 +117,9 @@ spec:
109117
resources: {{- toYaml .Values.controller.resources.livenessProbe | nindent 12 }}
110118
securityContext:
111119
readOnlyRootFilesystem: true
120+
capabilities:
121+
drop:
122+
- ALL
112123
- name: nfs
113124
{{- if hasPrefix "/" .Values.image.nfs.repository }}
114125
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
@@ -119,6 +130,8 @@ spec:
119130
privileged: true
120131
capabilities:
121132
add: ["SYS_ADMIN"]
133+
drop:
134+
- ALL
122135
allowPrivilegeEscalation: true
123136
imagePullPolicy: {{ .Values.image.nfs.pullPolicy }}
124137
args:
@@ -151,8 +164,6 @@ spec:
151164
mountPropagation: "Bidirectional"
152165
- mountPath: /csi
153166
name: socket-dir
154-
- mountPath: {{ .Values.controller.workingMountDir }}
155-
name: tmp-dir
156167
resources: {{- toYaml .Values.controller.resources.nfs | nindent 12 }}
157168
volumes:
158169
- name: pods-mount-dir
@@ -161,5 +172,3 @@ spec:
161172
type: Directory
162173
- name: socket-dir
163174
emptyDir: {}
164-
- name: tmp-dir
165-
emptyDir: {}

‎charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ spec:
6161
resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }}
6262
securityContext:
6363
readOnlyRootFilesystem: true
64+
capabilities:
65+
drop:
66+
- ALL
6467
- name: node-driver-registrar
6568
{{- if hasPrefix "/" .Values.image.nodeDriverRegistrar.repository }}
6669
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
@@ -93,13 +96,18 @@ spec:
9396
- name: registration-dir
9497
mountPath: /registration
9598
resources: {{- toYaml .Values.node.resources.nodeDriverRegistrar | nindent 12 }}
99+
securityContext:
100+
capabilities:
101+
drop:
102+
- ALL
96103
- name: nfs
97104
securityContext:
98105
privileged: true
99106
capabilities:
100107
add: ["SYS_ADMIN"]
108+
drop:
109+
- ALL
101110
allowPrivilegeEscalation: true
102-
readOnlyRootFilesystem: true
103111
{{- if hasPrefix "/" .Values.image.nfs.repository }}
104112
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
105113
{{- else }}

0 commit comments

Comments
 (0)