Skip to content

Commit f9061de

Browse files
committed
Add node-driver-registrar registration mode setup in Windows & Linux
1 parent dae19f1 commit f9061de

File tree

9 files changed

+95
-1
lines changed

9 files changed

+95
-1
lines changed

deploy/kubernetes/base/node_linux/node.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ spec:
3838
mountPath: /csi
3939
- name: registration-dir
4040
mountPath: /registration
41+
livenessProbe:
42+
initialDelaySeconds: 3
43+
exec:
44+
command:
45+
- /csi-node-driver-registrar
46+
- --kubelet-registration-path=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock
47+
- --mode=kubelet-registration-probe
4148
- name: gce-pd-driver
4249
# Don't change base image without changing pdImagePlaceholder in
4350
# test/k8s-integration/main.go

deploy/kubernetes/base/node_windows/node.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ spec:
3939
mountPath: /csi
4040
- name: registration-dir
4141
mountPath: /registration
42+
livenessProbe:
43+
initialDelaySeconds: 3
44+
exec:
45+
command:
46+
- /csi-node-driver-registrar.exe
47+
- --kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\pd.csi.storage.gke.io\\csi.sock
48+
- --mode=kubelet-registration-probe
4249
- name: gce-pd-driver
4350
# Don't change base image without changing pdImagePlaceholder in
4451
# test/k8s-integration/main.go

deploy/kubernetes/images/stable/image.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ metadata:
4040
name: imagetag-csi-node-registrar
4141
imageTag:
4242
name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
43-
newTag: "v2.1.0"
43+
newTag: "v2.3.0"
4444
---
4545

4646
apiVersion: builtin

deploy/kubernetes/overlays/stable-1-17/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ resources:
99
patchesStrategicMerge:
1010
- no_win_roles.yaml
1111
- no_v1_csidriver.yaml
12+
- no-node-driver-registrar-probe.yaml
1213
transformers:
1314
- ../../images/stable-1-17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node-win
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: csi-driver-registrar
10+
# introduced in node-driver-registrar v2.3.0
11+
livenessProbe:
12+
$patch: delete
13+
---
14+
kind: DaemonSet
15+
apiVersion: apps/v1
16+
metadata:
17+
name: csi-gce-pd-node
18+
spec:
19+
template:
20+
spec:
21+
containers:
22+
- name: csi-driver-registrar
23+
# introduced in node-driver-registrar v2.3.0
24+
livenessProbe:
25+
$patch: delete

deploy/kubernetes/overlays/stable-1-18/kustomization.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ namespace:
44
gce-pd-csi-driver
55
resources:
66
- ../../base
7+
patchesStrategicMerge:
8+
- no-node-driver-registrar-probe.yaml
79
transformers:
810
- ../../images/stable-1-18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node-win
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: csi-driver-registrar
10+
# introduced in node-driver-registrar v2.3.0
11+
livenessProbe:
12+
$patch: delete
13+
---
14+
kind: DaemonSet
15+
apiVersion: apps/v1
16+
metadata:
17+
name: csi-gce-pd-node
18+
spec:
19+
template:
20+
spec:
21+
containers:
22+
- name: csi-driver-registrar
23+
# introduced in node-driver-registrar v2.3.0
24+
livenessProbe:
25+
$patch: delete

deploy/kubernetes/overlays/stable-1-19/kustomization.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ namespace:
44
gce-pd-csi-driver
55
resources:
66
- ../../base/
7+
patchesStrategicMerge:
8+
- no-node-driver-registrar-probe.yaml
79
transformers:
810
- ../../images/stable-1-19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node-win
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: csi-driver-registrar
10+
# introduced in node-driver-registrar v2.3.0
11+
livenessProbe:
12+
$patch: delete
13+
---
14+
kind: DaemonSet
15+
apiVersion: apps/v1
16+
metadata:
17+
name: csi-gce-pd-node
18+
spec:
19+
template:
20+
spec:
21+
containers:
22+
- name: csi-driver-registrar
23+
# introduced in node-driver-registrar v2.3.0
24+
livenessProbe:
25+
$patch: delete

0 commit comments

Comments
 (0)