Skip to content

Commit 902f1f0

Browse files
andyzhangxandyzhangx
authored
Merge pull request #482 from andyzhangx/cut-v1.7.0
doc: cut v1.7.0 release
2 parents 4e99bc9 + 0f18dc3 commit 902f1f0

21 files changed

+1241
-27
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This driver allows Kubernetes to access [SMB](https://wiki.wireshark.org/SMB) se
1212
|Driver Version | supported k8s version | supported [Windows csi-proxy](https://github.com/kubernetes-csi/csi-proxy) version |
1313
|---------------|-----------------------|-------------------------------------|
1414
|master branch | 1.20+ | v0.2.2+ |
15+
|v1.7.0 | 1.20+ | v0.2.2+ |
1516
|v1.6.0 | 1.20+ | v0.2.2+ |
1617
|v1.5.0 | 1.19+ | v0.2.2+ |
17-
|v1.4.0 | 1.19+ | v0.2.2+ |
1818

1919
### Driver parameters
2020
Please refer to `smb.csi.k8s.io` [driver parameters](./docs/driver-parameters.md)

‎charts/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
### install a specific version
1010
```console
1111
helm repo add csi-driver-smb https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts
12-
helm install csi-driver-smb csi-driver-smb/csi-driver-smb --namespace kube-system --version v1.6.0
12+
helm install csi-driver-smb csi-driver-smb/csi-driver-smb --namespace kube-system --version v1.7.0
1313
```
1414

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

‎charts/index.yaml‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,53 @@ apiVersion: v1
22
entries:
33
csi-driver-smb:
44
- apiVersion: v1
5-
appVersion: latest
6-
created: "2022-04-12T01:04:31.690610079Z"
5+
appVersion: v1.7.0
6+
created: "2022-05-28T01:00:39.467682306Z"
77
description: SMB CSI Driver for Kubernetes
8-
digest: cf24f077d99a63385ff0b3988d36edd878c1165e2db4254099dd36e3c08a35cd
8+
digest: 022ce8f6e3b14b8823d9c90ea8ecf8b961004664935b529dda2698d71610c339
99
name: csi-driver-smb
1010
urls:
1111
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/latest/csi-driver-smb-v1.7.0.tgz
1212
version: v1.7.0
13+
- apiVersion: v1
14+
appVersion: v1.7.0
15+
created: "2022-05-28T01:00:39.499545301Z"
16+
description: SMB CSI Driver for Kubernetes
17+
digest: a9e26dd54014ab60c21ea2ad52e5681e687e792886a3943ea78ac217b86ace8f
18+
name: csi-driver-smb
19+
urls:
20+
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.7.0/csi-driver-smb-v1.7.0.tgz
21+
version: v1.7.0
1322
- apiVersion: v1
1423
appVersion: v1.6.0
15-
created: "2022-04-12T01:04:31.698287443Z"
24+
created: "2022-05-28T01:00:39.498678898Z"
1625
description: SMB CSI Driver for Kubernetes
17-
digest: 78676296fdc3c033b6e1209cee691a9786ae076dba215e15b72da06b6ed1d822
26+
digest: 31dd4c8b0b0d4a61565631aa5b433b18b5375aeb24812bf4fa9958d5b7917485
1827
name: csi-driver-smb
1928
urls:
2029
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.6.0/csi-driver-smb-v1.6.0.tgz
2130
version: v1.6.0
2231
- apiVersion: v1
2332
appVersion: v1.5.0
24-
created: "2022-04-12T01:04:31.696948331Z"
33+
created: "2022-05-28T01:00:39.493660583Z"
2534
description: SMB CSI Driver for Kubernetes
26-
digest: ccdaf76d75b7aa3ad16e4d06b6a7a010f00b83b707d8a21bb2e51500fe1a812c
35+
digest: b7dc9e9dc5d46df12a6d1a5643efe86439bff6c36867968f772e6899692083d6
2736
name: csi-driver-smb
2837
urls:
2938
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.5.0/csi-driver-smb-v1.5.0.tgz
3039
version: v1.5.0
3140
- apiVersion: v1
3241
appVersion: v1.4.0
33-
created: "2022-04-12T01:04:31.696031224Z"
42+
created: "2022-05-28T01:00:39.490536974Z"
3443
description: SMB CSI Driver for Kubernetes
35-
digest: 491313a33a8dba6fa812a5b074029566f31b2a9568f9220d7fd255ff3e50c4da
44+
digest: 9b1a6166ab72c09d0eefb448ecc998639b9f6255afb00bfc0ae0a4fdad76f119
3645
name: csi-driver-smb
3746
urls:
3847
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.4.0/csi-driver-smb-v1.4.0.tgz
3948
version: v1.4.0
4049
- apiVersion: v1
4150
appVersion: v1.3.0
42-
created: "2022-04-12T01:04:31.695227417Z"
51+
created: "2022-05-28T01:00:39.487228064Z"
4352
description: SMB CSI Driver for Kubernetes
4453
digest: d2236d36f1cb24139ddf87ea87229369ed856efc42330e656330f6cfa7635858
4554
name: csi-driver-smb
@@ -48,52 +57,52 @@ entries:
4857
version: v1.3.0
4958
- apiVersion: v1
5059
appVersion: v1.2.0
51-
created: "2022-04-12T01:04:31.694569412Z"
60+
created: "2022-05-28T01:00:39.48584216Z"
5261
description: SMB CSI Driver for Kubernetes
53-
digest: f475924011bf4b3d920cee85e07f1236731fc8256634c12f49b8eae1711c99ab
62+
digest: 9d7099165db24d5412c95b298a59cca9b233ab8800d04efd34bb055812390915
5463
name: csi-driver-smb
5564
urls:
5665
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.2.0/csi-driver-smb-v1.2.0.tgz
5766
version: v1.2.0
5867
- apiVersion: v1
5968
appVersion: v1.1.0
60-
created: "2022-04-12T01:04:31.693842906Z"
69+
created: "2022-05-28T01:00:39.483849754Z"
6170
description: SMB CSI Driver for Kubernetes
62-
digest: 19bdba4a6b473bf3d7494cea64146fc1874c8440e3adf5262d822659cd276837
71+
digest: 5b39613c9104db06815ee2d42fec8507c3bb2038264513449079a4eb5b6530a8
6372
name: csi-driver-smb
6473
urls:
6574
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.1.0/csi-driver-smb-v1.1.0.tgz
6675
version: v1.1.0
6776
- apiVersion: v1
6877
appVersion: v1.0.0
69-
created: "2022-04-12T01:04:31.693026099Z"
78+
created: "2022-05-28T01:00:39.479899042Z"
7079
description: SMB CSI Driver for Kubernetes
71-
digest: 2360e6e088403818944cc057ad3bf0f99ae295a421d4637f1d3c7cbe3c4ab27f
80+
digest: 3e4721dd007cc51750f7221be8f66ec7e287c83a8cdcfeb9a71c30f526b06dc4
7281
name: csi-driver-smb
7382
urls:
7483
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.0.0/csi-driver-smb-v1.0.0.tgz
7584
version: v1.0.0
7685
- apiVersion: v1
7786
appVersion: v0.6.0
78-
created: "2022-04-12T01:04:31.692622095Z"
87+
created: "2022-05-28T01:00:39.478819339Z"
7988
description: SMB CSI Driver for Kubernetes
80-
digest: 5ad0b7b9f84fa313387a9bbfb0ed59cff70b10633cedf81e7b77af936ff2806e
89+
digest: 6fc9d05bc78ca98fb17071b7f5ad05b4c071f2403114d72feae99fb89ca1fc9f
8190
name: csi-driver-smb
8291
urls:
8392
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v0.6.0/csi-driver-smb-v0.6.0.tgz
8493
version: v0.6.0
8594
- apiVersion: v1
8695
appVersion: v0.5.0
87-
created: "2022-04-12T01:04:31.692230992Z"
96+
created: "2022-05-28T01:00:39.478219837Z"
8897
description: SMB CSI Driver for Kubernetes
89-
digest: b400ef563745dcaf4a819a05b1e8a11d9442ae1ddf46da70542d5c87cd4cd9a1
98+
digest: 8264c6630806325613234c2d7951c188d073607e6f0f89d781ec32afed04157b
9099
name: csi-driver-smb
91100
urls:
92101
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v0.5.0/csi-driver-smb-v0.5.0.tgz
93102
version: v0.5.0
94103
- apiVersion: v1
95104
appVersion: v0.4.0
96-
created: "2022-04-12T01:04:31.691821989Z"
105+
created: "2022-05-28T01:00:39.477468335Z"
97106
description: SMB CSI Driver for Kubernetes
98107
digest: fb6d581ba5d4d1d78ca468f6daa4a24c47bb147b74d005d3c394521b4e534a3e
99108
name: csi-driver-smb
@@ -102,7 +111,7 @@ entries:
102111
version: v0.4.0
103112
- apiVersion: v1
104113
appVersion: v0.3.0
105-
created: "2022-04-12T01:04:31.691424785Z"
114+
created: "2022-05-28T01:00:39.474564226Z"
106115
description: SMB CSI Driver for Kubernetes
107116
digest: ee9e58db6d4a95491e2012c6607126bbff827b9c439e90e9a9798d2a73b0cb22
108117
name: csi-driver-smb
@@ -111,11 +120,11 @@ entries:
111120
version: v0.3.0
112121
- apiVersion: v1
113122
appVersion: v0.2.0
114-
created: "2022-04-12T01:04:31.691043882Z"
123+
created: "2022-05-28T01:00:39.471217716Z"
115124
description: SMB CSI Driver for Kubernetes
116125
digest: 8d8667106306d78dea9f63e5a3e8ee7ad2b60f86bd625f5968e37ca6a0cad317
117126
name: csi-driver-smb
118127
urls:
119128
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v0.2.0/csi-driver-smb-v0.2.0.tgz
120129
version: v0.2.0
121-
generated: "2022-04-12T01:04:31.688536961Z"
130+
generated: "2022-05-28T01:00:39.466675803Z"

‎charts/latest/csi-driver-smb-v1.7.0.tgz‎

-1 Bytes
Binary file not shown.

‎charts/v1.7.0/csi-driver-smb-v1.7.0.tgz‎

4.08 KB
Binary file not shown.

‎charts/v1.7.0/csi-driver-smb/Chart.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
appVersion: v1.7.0
3+
description: SMB CSI Driver for Kubernetes
4+
name: csi-driver-smb
5+
version: v1.7.0

‎charts/v1.7.0/csi-driver-smb/templates/NOTES.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
The CSI SMB Driver is getting deployed to your cluster.
2+
3+
To check CSI SMB Driver pods status, please run:
4+
5+
kubectl --namespace={{ .Release.Namespace }} get pods --selector="release={{ .Release.Name }}" --watch

‎charts/v1.7.0/csi-driver-smb/templates/_helpers.tpl‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{{/* vim: set filetype=mustache: */}}
2+
3+
{{/* Expand the name of the chart.*/}}
4+
{{- define "smb.name" -}}
5+
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
6+
{{- end -}}
7+
8+
{{/* labels for helm resources */}}
9+
{{- define "smb.labels" -}}
10+
labels:
11+
app.kubernetes.io/instance: "{{ .Release.Name }}"
12+
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
13+
app.kubernetes.io/name: "{{ template "smb.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 -}}
20+
21+
{{/* pull secrets for containers */}}
22+
{{- define "smb.pullSecrets" -}}
23+
{{- if .Values.imagePullSecrets }}
24+
imagePullSecrets:
25+
{{- range .Values.imagePullSecrets }}
26+
- name: {{ . }}
27+
{{- end }}
28+
{{- end }}
29+
{{- end -}}

‎charts/v1.7.0/csi-driver-smb/templates/csi-smb-controller.yaml‎

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 "smb.labels" . | indent 2 }}
8+
spec:
9+
replicas: {{ .Values.controller.replicas }}
10+
selector:
11+
matchLabels:
12+
app: {{ .Values.controller.name }}
13+
template:
14+
metadata:
15+
{{ include "smb.labels" . | indent 6 }}
16+
app: {{ .Values.controller.name }}
17+
{{- if .Values.podLabels }}
18+
{{- toYaml .Values.podLabels | nindent 8 }}
19+
{{- end }}
20+
{{- if .Values.podAnnotations }}
21+
annotations:
22+
{{ toYaml .Values.podAnnotations | indent 8 }}
23+
{{- end }}
24+
spec:
25+
{{- with .Values.controller.affinity }}
26+
affinity:
27+
{{ toYaml . | indent 8 }}
28+
{{- end }}
29+
dnsPolicy: {{ .Values.controller.dnsPolicy }}
30+
serviceAccountName: {{ .Values.serviceAccount.controller }}
31+
nodeSelector:
32+
{{- with .Values.controller.nodeSelector }}
33+
{{ toYaml . | indent 8 }}
34+
{{- end }}
35+
kubernetes.io/os: linux
36+
{{- if .Values.controller.runOnMaster}}
37+
kubernetes.io/role: master
38+
{{- end}}
39+
priorityClassName: system-cluster-critical
40+
{{- with .Values.controller.tolerations }}
41+
tolerations:
42+
{{ toYaml . | indent 8 }}
43+
{{- end }}
44+
{{- include "smb.pullSecrets" . | indent 6 }}
45+
containers:
46+
- name: csi-provisioner
47+
{{- if hasPrefix "/" .Values.image.csiProvisioner.repository }}
48+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
49+
{{- else }}
50+
image: "{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
51+
{{- end }}
52+
args:
53+
- "-v=2"
54+
- "--csi-address=$(ADDRESS)"
55+
- "--leader-election"
56+
- "--leader-election-namespace={{ .Release.Namespace }}"
57+
env:
58+
- name: ADDRESS
59+
value: /csi/csi.sock
60+
imagePullPolicy: {{ .Values.image.csiProvisioner.pullPolicy }}
61+
volumeMounts:
62+
- mountPath: /csi
63+
name: socket-dir
64+
resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }}
65+
- name: liveness-probe
66+
{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
67+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
68+
{{- else }}
69+
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
70+
{{- end }}
71+
args:
72+
- --csi-address=/csi/csi.sock
73+
- --probe-timeout=3s
74+
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
75+
- --v=2
76+
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
77+
volumeMounts:
78+
- name: socket-dir
79+
mountPath: /csi
80+
resources: {{- toYaml .Values.controller.resources.livenessProbe | nindent 12 }}
81+
- name: smb
82+
{{- if hasPrefix "/" .Values.image.smb.repository }}
83+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.smb.repository }}:{{ .Values.image.smb.tag }}"
84+
{{- else }}
85+
image: "{{ .Values.image.smb.repository }}:{{ .Values.image.smb.tag }}"
86+
{{- end }}
87+
imagePullPolicy: {{ .Values.image.smb.pullPolicy }}
88+
args:
89+
- "--v={{ .Values.controller.logLevel }}"
90+
- "--endpoint=$(CSI_ENDPOINT)"
91+
- "--metrics-address=0.0.0.0:{{ .Values.controller.metricsPort }}"
92+
- "--drivername={{ .Values.driver.name }}"
93+
- "--working-mount-dir={{ .Values.controller.workingMountDir }}"
94+
ports:
95+
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
96+
name: healthz
97+
protocol: TCP
98+
- containerPort: {{ .Values.controller.metricsPort }}
99+
name: metrics
100+
protocol: TCP
101+
livenessProbe:
102+
failureThreshold: 5
103+
httpGet:
104+
path: /healthz
105+
port: healthz
106+
initialDelaySeconds: 30
107+
timeoutSeconds: 10
108+
periodSeconds: 30
109+
env:
110+
- name: CSI_ENDPOINT
111+
value: unix:///csi/csi.sock
112+
securityContext:
113+
privileged: true
114+
volumeMounts:
115+
- mountPath: /csi
116+
name: socket-dir
117+
resources: {{- toYaml .Values.controller.resources.smb | nindent 12 }}
118+
volumes:
119+
- name: socket-dir
120+
emptyDir: {}
121+
{{- if .Values.securityContext }}
122+
securityContext: {{- toYaml .Values.securityContext | nindent 8 }}
123+
{{- end }}

‎charts/v1.7.0/csi-driver-smb/templates/csi-smb-driver.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
apiVersion: storage.k8s.io/v1
3+
kind: CSIDriver
4+
metadata:
5+
name: {{ .Values.driver.name }}
6+
spec:
7+
attachRequired: false
8+
podInfoOnMount: true

0 commit comments

Comments
 (0)