Skip to content

Commit 7b64a5d

Browse files
jingxu97jingxu97
committed
Add windows driver installation support
This PR adds windows driver support. It adds a windows base dir to install base yaml files. It also adds a windows alpha kustomization file. To install driver for windows, first set env NODE_OS=windows and GCE_PD_DRIVER_VERSION=alpha and run deploy/kubernetes/deploy-driver.sh script. This PR also reorgnize the dir structure for linux version. Now under overlay, we have a linux and a windows dir. Under each of them, we have alpha, stable, etc. Currently windows only has alpha version.
1 parent 85088c4 commit 7b64a5d

28 files changed

+336
-117
lines changed

‎deploy/kubernetes/base/controller.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ spec:
1717
# since it replaces GCE Metadata Server with GKE Metadata Server. Remove
1818
# this requirement when issue is resolved and before any exposure of
1919
# metrics ports
20+
nodeSelector:
21+
kubernetes.io/os: linux
2022
hostNetwork: true
2123
serviceAccountName: csi-gce-pd-controller-sa
2224
priorityClassName: csi-gce-pd-controller

‎deploy/kubernetes/base/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ commonLabels:
33
namespace:
44
gce-pd-csi-driver
55
resources:
6-
- node.yaml
76
- controller.yaml
87
- setup-cluster.yaml
8+
- node.yaml

‎deploy/kubernetes/base/node.yaml

+4-93
Original file line numberDiff line numberDiff line change
@@ -15,97 +15,8 @@ spec:
1515
# Host network must be used for interaction with Workload Identity in GKE
1616
# since it replaces GCE Metadata Server with GKE Metadata Server. Remove
1717
# this requirement when issue is resolved and before any exposure of
18-
# metrics ports.
19-
hostNetwork: true
18+
# metrics ports. But hostNetwork is not working for Windows, might be an issue
19+
# when deploying on GKE Windows node.
20+
# hostNetwork: true
2021
priorityClassName: csi-gce-pd-node
21-
serviceAccountName: csi-gce-pd-node-sa
22-
containers:
23-
- name: csi-driver-registrar
24-
image: gke.gcr.io/csi-node-driver-registrar
25-
args:
26-
- "--v=5"
27-
- "--csi-address=/csi/csi.sock"
28-
- "--kubelet-registration-path=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock"
29-
lifecycle:
30-
preStop:
31-
exec:
32-
command: ["/bin/sh", "-c", "rm -rf /registration/pd.csi.storage.gke.io /registration/pd.csi.storage.gke.io-reg.sock"]
33-
env:
34-
- name: KUBE_NODE_NAME
35-
valueFrom:
36-
fieldRef:
37-
fieldPath: spec.nodeName
38-
volumeMounts:
39-
- name: plugin-dir
40-
mountPath: /csi
41-
- name: registration-dir
42-
mountPath: /registration
43-
- name: gce-pd-driver
44-
securityContext:
45-
privileged: true
46-
# Don't change base image without changing pdImagePlaceholder in
47-
# test/k8s-integration/main.go
48-
image: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
49-
args:
50-
- "--v=5"
51-
- "--endpoint=unix:/csi/csi.sock"
52-
volumeMounts:
53-
- name: kubelet-dir
54-
mountPath: /var/lib/kubelet
55-
mountPropagation: "Bidirectional"
56-
- name: plugin-dir
57-
mountPath: /csi
58-
- name: device-dir
59-
mountPath: /dev
60-
# The following mounts are required to trigger host udevadm from
61-
# container
62-
- name: udev-rules-etc
63-
mountPath: /etc/udev
64-
- name: udev-rules-lib
65-
mountPath: /lib/udev
66-
- name: udev-socket
67-
mountPath: /run/udev
68-
- name: sys
69-
mountPath: /sys
70-
nodeSelector:
71-
kubernetes.io/os: linux
72-
volumes:
73-
- name: registration-dir
74-
hostPath:
75-
path: /var/lib/kubelet/plugins_registry/
76-
type: Directory
77-
- name: kubelet-dir
78-
hostPath:
79-
path: /var/lib/kubelet
80-
type: Directory
81-
- name: plugin-dir
82-
hostPath:
83-
path: /var/lib/kubelet/plugins/pd.csi.storage.gke.io/
84-
type: DirectoryOrCreate
85-
- name: device-dir
86-
hostPath:
87-
path: /dev
88-
type: Directory
89-
# The following mounts are required to trigger host udevadm from
90-
# container
91-
- name: udev-rules-etc
92-
hostPath:
93-
path: /etc/udev
94-
type: Directory
95-
- name: udev-rules-lib
96-
hostPath:
97-
path: /lib/udev
98-
type: Directory
99-
- name: udev-socket
100-
hostPath:
101-
path: /run/udev
102-
type: Directory
103-
- name: sys
104-
hostPath:
105-
path: /sys
106-
type: Directory
107-
# https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
108-
# See "special case". This will tolerate everything. Node component should
109-
# be scheduled on all nodes.
110-
tolerations:
111-
- operator: Exists
22+
serviceAccountName: csi-gce-pd-node-sa

‎deploy/kubernetes/base/setup-cluster.yaml

+13-9
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,6 @@ spec:
164164
volumes:
165165
- '*'
166166
hostNetwork: true
167-
allowedHostPaths:
168-
- pathPrefix: "/var/lib/kubelet/plugins_registry/"
169-
- pathPrefix: "/var/lib/kubelet"
170-
- pathPrefix: "/var/lib/kubelet/plugins/pd.csi.storage.gke.io/"
171-
- pathPrefix: "/dev"
172-
- pathPrefix: "/etc/udev"
173-
- pathPrefix: "/lib/udev"
174-
- pathPrefix: "/run/udev"
175-
- pathPrefix: "/sys"
176167
---
177168

178169
kind: ClusterRole
@@ -199,6 +190,19 @@ subjects:
199190
- kind: ServiceAccount
200191
name: csi-gce-pd-node-sa
201192

193+
---
194+
apiVersion: rbac.authorization.k8s.io/v1
195+
kind: ClusterRoleBinding
196+
metadata:
197+
name: csi-gce-pd-controller
198+
roleRef:
199+
apiGroup: rbac.authorization.k8s.io
200+
kind: ClusterRole
201+
name: csi-gce-pd-node-deploy
202+
subjects:
203+
- kind: ServiceAccount
204+
name: csi-gce-pd-controller-sa
205+
202206
---
203207
apiVersion: rbac.authorization.k8s.io/v1
204208
kind: ClusterRole

‎deploy/kubernetes/delete-driver.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ set -o errexit
1313
readonly NAMESPACE="${GCE_PD_DRIVER_NAMESPACE:-gce-pd-csi-driver}"
1414
readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable}"
1515
readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver"
16+
readonly OS="${OS:-linux}"
1617
source "${PKGDIR}/deploy/common.sh"
1718

1819
ensure_kustomize
1920

20-
${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${DEPLOY_VERSION} | ${KUBECTL} delete -v="${VERBOSITY}" --ignore-not-found -f -
21+
${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${OS}/${DEPLOY_VERSION} | ${KUBECTL} delete -v="${VERBOSITY}" --ignore-not-found -f -
2122
${KUBECTL} delete secret cloud-sa -v="${VERBOSITY}" --ignore-not-found
2223

2324
if [[ ${NAMESPACE} != "" && ${NAMESPACE} != "default" ]] && \

‎deploy/kubernetes/deploy-driver.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set -x
1919
readonly NAMESPACE="${GCE_PD_DRIVER_NAMESPACE:-gce-pd-csi-driver}"
2020
readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable}"
2121
readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver"
22+
readonly OS="${OS:-linux}"
2223
source "${PKGDIR}/deploy/common.sh"
2324

2425
print_usage()
@@ -95,6 +96,6 @@ fi
9596
${KUBECTL} version
9697

9798
readonly tmp_spec=/tmp/gcp-compute-persistent-disk-csi-driver-specs-generated.yaml
98-
${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${DEPLOY_VERSION} | tee $tmp_spec
99+
${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${OS}/${DEPLOY_VERSION} | tee $tmp_spec
99100
${KUBECTL} apply -v="${VERBOSITY}" -f $tmp_spec
100101

‎deploy/kubernetes/overlays/alpha/WARNING.md renamed to ‎deploy/kubernetes/overlays/linux/alpha/WARNING.md

File renamed without changes.

‎deploy/kubernetes/overlays/alpha/kustomization.yaml renamed to ‎deploy/kubernetes/overlays/linux/alpha/kustomization.yaml

File renamed without changes.

‎deploy/kubernetes/overlays/linux/base/allowedHostPaths.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: policy/v1beta1
2+
kind: PodSecurityPolicy
3+
metadata:
4+
name: csi-gce-pd-node-psp
5+
spec:
6+
allowedHostPaths:
7+
- pathPrefix: "/var/lib/kubelet/plugins_registry/"
8+
- pathPrefix: "/var/lib/kubelet"
9+
- pathPrefix: "/var/lib/kubelet/plugins/pd.csi.storage.gke.io/"
10+
- pathPrefix: "/dev"
11+
- pathPrefix: "/etc/udev"
12+
- pathPrefix: "/lib/udev"
13+
- pathPrefix: "/run/udev"
14+
- pathPrefix: "/sys"

‎deploy/kubernetes/overlays/linux/base/enableHostNetwork.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node
5+
spec:
6+
template:
7+
spec:
8+
hostNetwork: true

‎deploy/kubernetes/overlays/linux/base/kustomization.yaml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
bases:
4+
- ../../../base
5+
patchesStrategicMerge:
6+
- node.yaml
7+
- allowedHostPaths.yaml
8+
images:
9+
- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
10+
# Don't change stable image without changing pdImagePlaceholder in
11+
# test/k8s-integration/main.go
12+
newName: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
13+
newTag: "v0.7.0-gke.0"
14+
- name: gke.gcr.io/csi-provisioner
15+
newName: gke.gcr.io/csi-provisioner
16+
newTag: "v1.5.0-gke.0"
17+
- name: gke.gcr.io/csi-attacher
18+
newName: gke.gcr.io/csi-attacher
19+
newTag: "v2.1.1-gke.0"
20+
- name: gke.gcr.io/csi-node-driver-registrar
21+
newName: gke.gcr.io/csi-node-driver-registrar
22+
newTag: "v1.2.0-gke.0"
23+
- name: gke.gcr.io/csi-resizer
24+
newName: gke.gcr.io/csi-resizer
25+
newTag: "v0.4.0-gke.0"
26+
- name: gke.gcr.io/csi-snapshotter
27+
newName: gke.gcr.io/csi-snapshotter
28+
newTag: "v2.1.1-gke.0"

‎deploy/kubernetes/overlays/linux/base/node.yaml

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node
5+
spec:
6+
template:
7+
spec:
8+
nodeSelector:
9+
kubernetes.io/os: linux
10+
# Host network must be used for interaction with Workload Identity in GKE
11+
# since it replaces GCE Metadata Server with GKE Metadata Server. Remove
12+
# this requirement when issue is resolved and before any exposure of
13+
# metrics ports. But hostNetwork is not working for Windows, might be an issue
14+
# when deploying on GKE Windows node.
15+
hostNetwork: true
16+
containers:
17+
- name: csi-driver-registrar
18+
image: gke.gcr.io/csi-node-driver-registrar
19+
args:
20+
- "--v=5"
21+
- "--csi-address=/csi/csi.sock"
22+
- "--kubelet-registration-path=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock"
23+
env:
24+
- name: KUBE_NODE_NAME
25+
valueFrom:
26+
fieldRef:
27+
fieldPath: spec.nodeName
28+
volumeMounts:
29+
- name: plugin-dir
30+
mountPath: /csi
31+
- name: registration-dir
32+
mountPath: /registration
33+
- name: gce-pd-driver
34+
# Don't change base image without changing pdImagePlaceholder in
35+
# test/k8s-integration/main.go
36+
image: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
37+
args:
38+
- "--v=5"
39+
- "--endpoint=unix:/csi/csi.sock"
40+
securityContext:
41+
privileged: true
42+
volumeMounts:
43+
- name: kubelet-dir
44+
mountPath: /var/lib/kubelet
45+
mountPropagation: "Bidirectional"
46+
- name: plugin-dir
47+
mountPath: /csi
48+
- name: device-dir
49+
mountPath: /dev
50+
# The following mounts are required to trigger host udevadm from
51+
# container
52+
- name: udev-rules-etc
53+
mountPath: /etc/udev
54+
- name: udev-rules-lib
55+
mountPath: /lib/udev
56+
- name: udev-socket
57+
mountPath: /run/udev
58+
- name: sys
59+
mountPath: /sys
60+
volumes:
61+
- name: registration-dir
62+
hostPath:
63+
path: /var/lib/kubelet/plugins_registry/
64+
type: Directory
65+
- name: kubelet-dir
66+
hostPath:
67+
path: /var/lib/kubelet
68+
type: Directory
69+
- name: plugin-dir
70+
hostPath:
71+
path: /var/lib/kubelet/plugins/pd.csi.storage.gke.io/
72+
type: DirectoryOrCreate
73+
- name: device-dir
74+
hostPath:
75+
path: /dev
76+
type: Directory
77+
# The following mounts are required to trigger host udevadm from
78+
# container
79+
- name: udev-rules-etc
80+
hostPath:
81+
path: /etc/udev
82+
type: Directory
83+
- name: udev-rules-lib
84+
hostPath:
85+
path: /lib/udev
86+
type: Directory
87+
- name: udev-socket
88+
hostPath:
89+
path: /run/udev
90+
type: Directory
91+
- name: sys
92+
hostPath:
93+
path: /sys
94+
type: Directory
95+
# https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
96+
# See "special case". This will tolerate everything. Node component should
97+
# be scheduled on all nodes.
98+
tolerations:
99+
- operator: Exists

‎deploy/kubernetes/overlays/linux/base/noderegistrar.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: csi-driver-registrar
10+
args:
11+
- "--v=5"
12+
- "--csi-address=/csi/csi.sock"
13+
- "--kubelet-registration-path=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock"

‎deploy/kubernetes/overlays/dev/WARNING.md renamed to ‎deploy/kubernetes/overlays/linux/dev/WARNING.md

+1-8
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,4 @@ BROKEN AT ANY TIME
55
This is the absolute cutting edge development Driver, it is intended for testing
66
and development only and can have vast differences in
77
functionality/behavior/configuration. Use only to try the newest features that
8-
are not guaranteed to work yet.
9-
10-
APPROXIMATE CHANGELOG in latest:
11-
* Topology
12-
* RePD
13-
* Volume ID Format Changed
14-
* Node ID Format Changed
15-
* Parameter "zone" Removed
8+
are not guaranteed to work yet.

‎deploy/kubernetes/overlays/dev/controller_always_pull.yaml renamed to ‎deploy/kubernetes/overlays/linux/dev/controller_always_pull.yaml

File renamed without changes.

‎deploy/kubernetes/overlays/dev/kustomization.yaml renamed to ‎deploy/kubernetes/overlays/linux/dev/kustomization.yaml

File renamed without changes.

‎deploy/kubernetes/overlays/dev/node_always_pull.yaml renamed to ‎deploy/kubernetes/overlays/linux/dev/node_always_pull.yaml

File renamed without changes.

‎deploy/kubernetes/overlays/prow-gke-release-staging-head/README.md renamed to ‎deploy/kubernetes/overlays/linux/prow-gke-release-staging-head/README.md

File renamed without changes.

‎deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml renamed to ‎deploy/kubernetes/overlays/linux/prow-gke-release-staging-head/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
bases:
4-
- ../../base
4+
- ../base
55
images:
66
- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
77
newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver

‎deploy/kubernetes/overlays/prow-gke-release-staging-rc/README.md renamed to ‎deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/README.md

File renamed without changes.

‎deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml renamed to ‎deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
bases:
4-
- ../../base
4+
- ../base
55
images:
66
- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
77
newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver

‎deploy/kubernetes/overlays/stable/kustomization.yaml renamed to ‎deploy/kubernetes/overlays/linux/stable/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
bases:
4-
- ../../base
4+
- ../base
55
images:
66
- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
77
# Don't change stable image without changing pdImagePlaceholder in

0 commit comments

Comments
 (0)