Skip to content

Commit 4f31917

Browse files
authored
Merge pull request #401 from andyzhangx/cut-v4.2.0
doc: cut v4.2.0 release
2 parents a493bb4 + 9411504 commit 4f31917

20 files changed

+887
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
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.2.0 | 1.21+ | GA |
1516
|v4.1.0 | 1.20+ | GA |
1617
|v4.0.0 | 1.20+ | GA |
17-
|v3.1.0 | 1.19+ | beta |
1818

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

charts/README.md

Lines changed: 1 addition & 1 deletion
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.1.0
18+
helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.2.0
1919
```
2020

2121
### install driver with customized driver name, deployment name

charts/index.yaml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,36 @@
11
apiVersion: v1
22
entries:
33
csi-driver-nfs:
4+
- apiVersion: v1
5+
appVersion: v4.2.0
6+
created: "2023-02-19T03:06:17.779651726Z"
7+
description: CSI NFS Driver for Kubernetes
8+
digest: e702f6c9be35f2649f5736ca5fcdc40ab1c6a235f41e7fb2472d208e8a5ebf47
9+
name: csi-driver-nfs
10+
urls:
11+
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.2.0/csi-driver-nfs-v4.2.0.tgz
12+
version: v4.2.0
413
- apiVersion: v1
514
appVersion: v4.1.0
6-
created: "2022-07-05T06:47:20.800889706Z"
15+
created: "2023-02-19T03:06:17.779230713Z"
716
description: CSI NFS Driver for Kubernetes
8-
digest: f6c513b1f58bc7508032c7609738756f8690555f0e23a3a2ba02dbbd585b7ead
17+
digest: b2baa2f129976cf2981c8873290aac509aa3c5937ffc319fbf69fbe3271c23eb
918
name: csi-driver-nfs
1019
urls:
1120
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.1.0/csi-driver-nfs-v4.1.0.tgz
1221
version: v4.1.0
1322
- apiVersion: v1
1423
appVersion: v4.0.0
15-
created: "2022-07-05T06:47:20.800130103Z"
24+
created: "2023-02-19T03:06:17.778817545Z"
1625
description: CSI NFS Driver for Kubernetes
17-
digest: cb537287512ce9f99adaead8cd4904ed7284780bdc44c9b8d6705e66f28bfa5c
26+
digest: 3145fd12225a639908b14675c8ae1f272bc0e57ffa2895b6f17411486a24229d
1827
name: csi-driver-nfs
1928
urls:
2029
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.0.0/csi-driver-nfs-v4.0.0.tgz
2130
version: v4.0.0
2231
- apiVersion: v1
2332
appVersion: v3.1.0
24-
created: "2022-07-05T06:47:20.7993494Z"
33+
created: "2023-02-19T03:06:17.778410591Z"
2534
description: CSI NFS Driver for Kubernetes
2635
digest: 7e51bb9188b013195cafc265102fa365de9ec5513780e1dfc5363289f811a4d9
2736
name: csi-driver-nfs
@@ -30,7 +39,7 @@ entries:
3039
version: v3.1.0
3140
- apiVersion: v1
3241
appVersion: v3.0.0
33-
created: "2022-07-05T06:47:20.798650697Z"
42+
created: "2023-02-19T03:06:17.778027388Z"
3443
description: CSI NFS Driver for Kubernetes
3544
digest: 44406231cd5cdada1c62a0541b93b4f5d5a70ccc8c50b33553a8692fe6cfae96
3645
name: csi-driver-nfs
@@ -39,7 +48,7 @@ entries:
3948
version: v3.0.0
4049
- apiVersion: v1
4150
appVersion: v2.0.0
42-
created: "2022-07-05T06:47:20.798008295Z"
51+
created: "2023-02-19T03:06:17.777605366Z"
4352
description: CSI NFS Driver for Kubernetes
4453
digest: 1a32c6fc016526fe19a0c9e0dfbe83d0ddde67ced533bb5f5d24d713f706c613
4554
name: csi-driver-nfs
@@ -48,11 +57,11 @@ entries:
4857
version: v2.0.0
4958
- apiVersion: v1
5059
appVersion: latest
51-
created: "2022-07-05T06:47:20.797517293Z"
60+
created: "2023-02-19T03:06:17.777385954Z"
5261
description: CSI NFS Driver for Kubernetes
53-
digest: 6bdf28e22cf06093e29b8a4ddddfb7a5eed253e0519fa1cd2f7ce2b4ea82abb6
62+
digest: 16549e803dcdcf624e6dffeaff63cea7cfde0447651cc188060d5f2801f21c9f
5463
name: csi-driver-nfs
5564
urls:
5665
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/latest/csi-driver-nfs-v0.0.0.tgz
5766
version: v0.0.0
58-
generated: "2022-07-05T06:47:20.796518189Z"
67+
generated: "2023-02-19T03:06:17.776802428Z"
0 Bytes
Binary file not shown.
3.62 KB
Binary file not shown.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Patterns to ignore when building packages.
2+
# This supports shell glob matching, relative path matching, and
3+
# negation (prefixed with !). Only one pattern per line.
4+
.DS_Store
5+
# Common VCS dirs
6+
.git/
7+
.gitignore
8+
.bzr/
9+
.bzrignore
10+
.hg/
11+
.hgignore
12+
.svn/
13+
# Common backup files
14+
*.swp
15+
*.bak
16+
*.tmp
17+
*~
18+
# Various IDEs
19+
.project
20+
.idea/
21+
*.tmproj
22+
.vscode/
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
appVersion: v4.2.0
3+
description: CSI NFS Driver for Kubernetes
4+
name: csi-driver-nfs
5+
version: v4.2.0
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
The CSI NFS Driver is getting deployed to your cluster.
2+
3+
To check CSI NFS Driver pods status, please run:
4+
5+
kubectl --namespace={{ .Release.Namespace }} get pods --selector="app.kubernetes.io/instance={{ .Release.Name }}" --watch
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{{/* vim: set filetype=mustache: */}}
2+
3+
{{/* Expand the name of the chart.*/}}
4+
{{- define "nfs.name" -}}
5+
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
6+
{{- end -}}
7+
8+
{{/* labels for helm resources */}}
9+
{{- define "nfs.labels" -}}
10+
labels:
11+
app.kubernetes.io/instance: "{{ .Release.Name }}"
12+
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
13+
app.kubernetes.io/name: "{{ template "nfs.name" . }}"
14+
app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
15+
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
16+
{{- if .Values.customLabels }}
17+
{{ toYaml .Values.customLabels | indent 2 -}}
18+
{{- end }}
19+
{{- end -}}
Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
---
2+
kind: Deployment
3+
apiVersion: apps/v1
4+
metadata:
5+
name: {{ .Values.controller.name }}
6+
namespace: {{ .Release.Namespace }}
7+
{{ include "nfs.labels" . | indent 2 }}
8+
spec:
9+
replicas: {{ .Values.controller.replicas }}
10+
selector:
11+
matchLabels:
12+
app: {{ .Values.controller.name }}
13+
strategy:
14+
type: {{ .Values.controller.strategyType }}
15+
template:
16+
metadata:
17+
{{ include "nfs.labels" . | indent 6 }}
18+
app: {{ .Values.controller.name }}
19+
spec:
20+
{{- if .Values.imagePullSecrets }}
21+
imagePullSecrets:
22+
{{ toYaml .Values.imagePullSecrets | indent 8 }}
23+
{{- end }}
24+
hostNetwork: true # controller also needs to mount nfs to create dir
25+
dnsPolicy: {{ .Values.controller.dnsPolicy }}
26+
serviceAccountName: {{ .Values.serviceAccount.controller }}
27+
{{- with .Values.controller.affinity }}
28+
affinity:
29+
{{ toYaml . | indent 8 }}
30+
{{- end }}
31+
nodeSelector:
32+
kubernetes.io/os: linux
33+
{{- if .Values.controller.runOnMaster}}
34+
node-role.kubernetes.io/master: ""
35+
{{- end}}
36+
{{- if .Values.controller.runOnControlPlane}}
37+
node-role.kubernetes.io/control-plane: ""
38+
{{- end}}
39+
{{- with .Values.controller.nodeSelector }}
40+
{{ toYaml . | indent 8 }}
41+
{{- end }}
42+
priorityClassName: system-cluster-critical
43+
{{- with .Values.controller.tolerations }}
44+
tolerations:
45+
{{ toYaml . | indent 8 }}
46+
{{- end }}
47+
containers:
48+
- name: csi-provisioner
49+
image: "{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
50+
args:
51+
- "-v=2"
52+
- "--csi-address=$(ADDRESS)"
53+
- "--leader-election"
54+
- "--leader-election-namespace={{ .Release.Namespace }}"
55+
- "--extra-create-metadata=true"
56+
env:
57+
- name: ADDRESS
58+
value: /csi/csi.sock
59+
imagePullPolicy: {{ .Values.image.csiProvisioner.pullPolicy }}
60+
volumeMounts:
61+
- mountPath: /csi
62+
name: socket-dir
63+
resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }}
64+
- name: liveness-probe
65+
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
66+
args:
67+
- --csi-address=/csi/csi.sock
68+
- --probe-timeout=3s
69+
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
70+
- --v=2
71+
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
72+
volumeMounts:
73+
- name: socket-dir
74+
mountPath: /csi
75+
resources: {{- toYaml .Values.controller.resources.livenessProbe | nindent 12 }}
76+
- name: nfs
77+
image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
78+
securityContext:
79+
privileged: true
80+
capabilities:
81+
add: ["SYS_ADMIN"]
82+
allowPrivilegeEscalation: true
83+
imagePullPolicy: {{ .Values.image.nfs.pullPolicy }}
84+
args:
85+
- "--v={{ .Values.controller.logLevel }}"
86+
- "--nodeid=$(NODE_ID)"
87+
- "--endpoint=$(CSI_ENDPOINT)"
88+
- "--drivername={{ .Values.driver.name }}"
89+
- "--mount-permissions={{ .Values.driver.mountPermissions }}"
90+
- "--working-mount-dir={{ .Values.controller.workingMountDir }}"
91+
env:
92+
- name: NODE_ID
93+
valueFrom:
94+
fieldRef:
95+
fieldPath: spec.nodeName
96+
- name: CSI_ENDPOINT
97+
value: unix:///csi/csi.sock
98+
ports:
99+
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
100+
name: healthz
101+
protocol: TCP
102+
livenessProbe:
103+
failureThreshold: 5
104+
httpGet:
105+
path: /healthz
106+
port: healthz
107+
initialDelaySeconds: 30
108+
timeoutSeconds: 10
109+
periodSeconds: 30
110+
volumeMounts:
111+
- name: pods-mount-dir
112+
mountPath: {{ .Values.kubeletDir }}/pods
113+
mountPropagation: "Bidirectional"
114+
- mountPath: /csi
115+
name: socket-dir
116+
resources: {{- toYaml .Values.controller.resources.nfs | nindent 12 }}
117+
volumes:
118+
- name: pods-mount-dir
119+
hostPath:
120+
path: {{ .Values.kubeletDir }}/pods
121+
type: Directory
122+
- name: socket-dir
123+
emptyDir: {}

0 commit comments

Comments
 (0)