Skip to content

Commit ee80c79

Browse files
andyzhangxandyzhangx
committed
feat: cut v0.2.0
1 parent ec7f7f7 commit ee80c79

11 files changed

+445
-3
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This driver allows Kubernetes to use [SMB](https://wiki.wireshark.org/SMB) CSI v
1212
|SMB CSI Driver Version | Image | 1.14+ |
1313
|------------------------|----------------------------------------------|--------|
1414
|master branch |mcr.microsoft.com/k8s/csi/smb-csi:latest | yes |
15+
|v0.2.0 |mcr.microsoft.com/k8s/csi/smb-csi:v0.2.0 | yes |
1516
|v0.1.0 |mcr.microsoft.com/k8s/csi/smb-csi:v0.1.0 | yes |
1617

1718
### Driver parameters

‎deploy/csi-smb-controller.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
cpu: 10m
6363
memory: 20Mi
6464
- name: smb
65-
image: mcr.microsoft.com/k8s/csi/smb-csi:latest
65+
image: mcr.microsoft.com/k8s/csi/smb-csi:v0.2.0
6666
imagePullPolicy: IfNotPresent
6767
args:
6868
- "--v=5"

‎deploy/csi-smb-node-windows.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ spec:
6565
cpu: 10m
6666
memory: 20Mi
6767
- name: smb
68-
image: mcr.microsoft.com/k8s/csi/smb-csi:latest
68+
image: mcr.microsoft.com/k8s/csi/smb-csi:v0.2.0
6969
imagePullPolicy: IfNotPresent
7070
args:
7171
- --v=5

‎deploy/csi-smb-node.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
cpu: 10m
6565
memory: 20Mi
6666
- name: smb
67-
image: mcr.microsoft.com/k8s/csi/smb-csi:latest
67+
image: mcr.microsoft.com/k8s/csi/smb-csi:v0.2.0
6868
imagePullPolicy: IfNotPresent
6969
args:
7070
- "--v=5"

‎deploy/v0.2.0/csi-smb-controller.yaml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
---
2+
kind: Deployment
3+
apiVersion: apps/v1
4+
metadata:
5+
name: csi-smb-controller
6+
namespace: kube-system
7+
spec:
8+
replicas: 2
9+
selector:
10+
matchLabels:
11+
app: csi-smb-controller
12+
template:
13+
metadata:
14+
labels:
15+
app: csi-smb-controller
16+
spec:
17+
serviceAccountName: csi-smb-controller-sa
18+
nodeSelector:
19+
kubernetes.io/os: linux
20+
priorityClassName: system-cluster-critical
21+
tolerations:
22+
- key: "node-role.kubernetes.io/master"
23+
operator: "Equal"
24+
value: "true"
25+
effect: "NoSchedule"
26+
containers:
27+
- name: csi-provisioner
28+
image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v1.4.0
29+
args:
30+
- "-v=5"
31+
- "--csi-address=$(ADDRESS)"
32+
- "--enable-leader-election"
33+
- "--leader-election-type=leases"
34+
env:
35+
- name: ADDRESS
36+
value: /csi/csi.sock
37+
volumeMounts:
38+
- mountPath: /csi
39+
name: socket-dir
40+
resources:
41+
limits:
42+
cpu: 1
43+
memory: 1Gi
44+
requests:
45+
cpu: 10m
46+
memory: 20Mi
47+
- name: liveness-probe
48+
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v1.1.0
49+
args:
50+
- --csi-address=/csi/csi.sock
51+
- --connection-timeout=3s
52+
- --health-port=29632
53+
- --v=5
54+
volumeMounts:
55+
- name: socket-dir
56+
mountPath: /csi
57+
resources:
58+
limits:
59+
cpu: 1
60+
memory: 1Gi
61+
requests:
62+
cpu: 10m
63+
memory: 20Mi
64+
- name: smb
65+
image: mcr.microsoft.com/k8s/csi/smb-csi:v0.2.0
66+
imagePullPolicy: IfNotPresent
67+
args:
68+
- "--v=5"
69+
- "--endpoint=$(CSI_ENDPOINT)"
70+
ports:
71+
- containerPort: 29632
72+
name: healthz
73+
protocol: TCP
74+
- containerPort: 29634
75+
name: metrics
76+
protocol: TCP
77+
livenessProbe:
78+
failureThreshold: 5
79+
httpGet:
80+
path: /healthz
81+
port: healthz
82+
initialDelaySeconds: 30
83+
timeoutSeconds: 10
84+
periodSeconds: 30
85+
env:
86+
- name: CSI_ENDPOINT
87+
value: unix:///csi/csi.sock
88+
volumeMounts:
89+
- mountPath: /csi
90+
name: socket-dir
91+
resources:
92+
limits:
93+
cpu: 1
94+
memory: 1Gi
95+
requests:
96+
cpu: 10m
97+
memory: 20Mi
98+
volumes:
99+
- name: socket-dir
100+
emptyDir: {}

‎deploy/v0.2.0/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/v1beta1
3+
kind: CSIDriver
4+
metadata:
5+
name: smb.csi.k8s.io
6+
spec:
7+
attachRequired: false
8+
podInfoOnMount: true

‎deploy/v0.2.0/csi-smb-node-windows.yaml‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
---
2+
kind: DaemonSet
3+
apiVersion: apps/v1
4+
metadata:
5+
name: csi-smb-node-win
6+
namespace: kube-system
7+
spec:
8+
selector:
9+
matchLabels:
10+
app: csi-smb-node-win
11+
template:
12+
metadata:
13+
labels:
14+
app: csi-smb-node-win
15+
spec:
16+
nodeSelector:
17+
kubernetes.io/os: windows
18+
priorityClassName: system-node-critical
19+
containers:
20+
- name: liveness-probe
21+
volumeMounts:
22+
- mountPath: C:\csi
23+
name: plugin-dir
24+
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.0.1-alpha.1-windows-1809-amd64
25+
args:
26+
- --csi-address=$(CSI_ENDPOINT)
27+
- --probe-timeout=3s
28+
- --health-port=39613
29+
- --v=5
30+
env:
31+
- name: CSI_ENDPOINT
32+
value: unix://C:\\csi\\csi.sock
33+
resources:
34+
limits:
35+
cpu: 2
36+
memory: 2Gi
37+
requests:
38+
cpu: 10m
39+
memory: 20Mi
40+
- name: node-driver-registrar
41+
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v1.2.1-alpha.1-windows-1809-amd64
42+
args:
43+
- --v=5
44+
- --csi-address=$(CSI_ENDPOINT)
45+
- --kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\smb.csi.k8s.io\\csi.sock
46+
env:
47+
- name: CSI_ENDPOINT
48+
value: unix://C:\\csi\\csi.sock
49+
- name: KUBE_NODE_NAME
50+
valueFrom:
51+
fieldRef:
52+
fieldPath: spec.nodeName
53+
volumeMounts:
54+
- name: kubelet-dir
55+
mountPath: "C:\\var\\lib\\kubelet"
56+
- name: plugin-dir
57+
mountPath: C:\csi
58+
- name: registration-dir
59+
mountPath: C:\registration
60+
resources:
61+
limits:
62+
cpu: 2
63+
memory: 2Gi
64+
requests:
65+
cpu: 10m
66+
memory: 20Mi
67+
- name: smb
68+
image: mcr.microsoft.com/k8s/csi/smb-csi:v0.2.0
69+
imagePullPolicy: IfNotPresent
70+
args:
71+
- --v=5
72+
- --endpoint=$(CSI_ENDPOINT)
73+
- --nodeid=$(KUBE_NODE_NAME)
74+
ports:
75+
- containerPort: 39613
76+
name: healthz
77+
protocol: TCP
78+
- containerPort: 39615
79+
name: metrics
80+
protocol: TCP
81+
livenessProbe:
82+
failureThreshold: 5
83+
httpGet:
84+
path: /healthz
85+
port: healthz
86+
initialDelaySeconds: 30
87+
timeoutSeconds: 10
88+
periodSeconds: 30
89+
env:
90+
- name: CSI_ENDPOINT
91+
value: unix://C:\\csi\\csi.sock
92+
- name: KUBE_NODE_NAME
93+
valueFrom:
94+
fieldRef:
95+
apiVersion: v1
96+
fieldPath: spec.nodeName
97+
securityContext:
98+
privileged: true
99+
volumeMounts:
100+
- name: kubelet-dir
101+
mountPath: "C:\\var\\lib\\kubelet"
102+
- name: plugin-dir
103+
mountPath: C:\csi
104+
- name: csi-proxy-fs-pipe
105+
mountPath: \\.\pipe\csi-proxy-filesystem-v1alpha1
106+
- name: csi-proxy-smb-pipe
107+
mountPath: \\.\pipe\csi-proxy-smb-v1alpha1
108+
resources:
109+
limits:
110+
cpu: 2
111+
memory: 2Gi
112+
requests:
113+
cpu: 10m
114+
memory: 20Mi
115+
volumes:
116+
- name: csi-proxy-fs-pipe
117+
hostPath:
118+
path: \\.\pipe\csi-proxy-filesystem-v1alpha1
119+
type: ""
120+
- name: csi-proxy-smb-pipe
121+
hostPath:
122+
path: \\.\pipe\csi-proxy-smb-v1alpha1
123+
type: ""
124+
- name: registration-dir
125+
hostPath:
126+
path: C:\var\lib\kubelet\plugins_registry\
127+
type: Directory
128+
- name: kubelet-dir
129+
hostPath:
130+
path: C:\var\lib\kubelet\
131+
type: Directory
132+
- name: plugin-dir
133+
hostPath:
134+
path: C:\var\lib\kubelet\plugins\smb.csi.k8s.io\
135+
type: DirectoryOrCreate

0 commit comments

Comments
 (0)