From 998782b2c1c95890931f846f48654d8c2be7507d Mon Sep 17 00:00:00 2001 From: Jing Xu Date: Tue, 19 May 2020 11:21:51 -0700 Subject: [PATCH] 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. --- deploy/kubernetes/base/node.yaml | 56 +--------------- deploy/kubernetes/delete-driver.sh | 3 +- deploy/kubernetes/deploy-driver.sh | 3 +- .../overlays/{ => linux}/alpha/WARNING.md | 0 .../{ => linux}/alpha/kustomization.yaml | 0 .../linux/base/enableHostNetwork.yaml | 8 +++ .../kubernetes/overlays/linux/base/gcepd.yaml | 67 +++++++++++++++++++ .../overlays/linux/base/kustomization.yaml | 29 ++++++++ .../overlays/linux/base/noderegistrar.yaml | 13 ++++ .../overlays/{ => linux}/dev/WARNING.md | 9 +-- .../dev/controller_always_pull.yaml | 0 .../{ => linux}/dev/kustomization.yaml | 0 .../{ => linux}/dev/node_always_pull.yaml | 0 .../prow-gke-release-staging-head/README.md | 0 .../kustomization.yaml | 2 +- .../prow-gke-release-staging-rc/README.md | 0 .../enable_sidecar_metrics.yaml | 0 .../kustomization.yaml | 2 +- .../{ => linux}/stable/kustomization.yaml | 2 +- .../overlays/windows/dev/gcepd.yaml | 46 +++++++++++++ .../overlays/windows/dev/kustomization.yaml | 33 +++++++++ .../overlays/windows/dev/noderegistrar.yaml | 17 +++++ test/k8s-integration/driver.go | 2 +- 23 files changed, 225 insertions(+), 67 deletions(-) rename deploy/kubernetes/overlays/{ => linux}/alpha/WARNING.md (100%) rename deploy/kubernetes/overlays/{ => linux}/alpha/kustomization.yaml (100%) create mode 100644 deploy/kubernetes/overlays/linux/base/enableHostNetwork.yaml create mode 100644 deploy/kubernetes/overlays/linux/base/gcepd.yaml create mode 100644 deploy/kubernetes/overlays/linux/base/kustomization.yaml create mode 100644 deploy/kubernetes/overlays/linux/base/noderegistrar.yaml rename deploy/kubernetes/overlays/{ => linux}/dev/WARNING.md (70%) rename deploy/kubernetes/overlays/{ => linux}/dev/controller_always_pull.yaml (100%) rename deploy/kubernetes/overlays/{ => linux}/dev/kustomization.yaml (100%) rename deploy/kubernetes/overlays/{ => linux}/dev/node_always_pull.yaml (100%) rename deploy/kubernetes/overlays/{ => linux}/prow-gke-release-staging-head/README.md (100%) rename deploy/kubernetes/overlays/{ => linux}/prow-gke-release-staging-head/kustomization.yaml (98%) rename deploy/kubernetes/overlays/{ => linux}/prow-gke-release-staging-rc/README.md (100%) rename deploy/kubernetes/overlays/{ => linux}/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml (100%) rename deploy/kubernetes/overlays/{ => linux}/prow-gke-release-staging-rc/kustomization.yaml (98%) rename deploy/kubernetes/overlays/{ => linux}/stable/kustomization.yaml (98%) create mode 100644 deploy/kubernetes/overlays/windows/dev/gcepd.yaml create mode 100644 deploy/kubernetes/overlays/windows/dev/kustomization.yaml create mode 100644 deploy/kubernetes/overlays/windows/dev/noderegistrar.yaml diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml index 07397cebe2..4632c615eb 100644 --- a/deploy/kubernetes/base/node.yaml +++ b/deploy/kubernetes/base/node.yaml @@ -15,21 +15,14 @@ spec: # Host network must be used for interaction with Workload Identity in GKE # since it replaces GCE Metadata Server with GKE Metadata Server. Remove # this requirement when issue is resolved and before any exposure of - # metrics ports. - hostNetwork: true + # metrics ports. But hostNetwork is not working for Windows, might be an issue + # when deploying on GKE Windows node. + # hostNetwork: true priorityClassName: csi-gce-pd-node serviceAccountName: csi-gce-pd-node-sa containers: - name: csi-driver-registrar image: gke.gcr.io/csi-node-driver-registrar - args: - - "--v=5" - - "--csi-address=/csi/csi.sock" - - "--kubelet-registration-path=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock" - lifecycle: - preStop: - exec: - command: ["/bin/sh", "-c", "rm -rf /registration/pd.csi.storage.gke.io /registration/pd.csi.storage.gke.io-reg.sock"] env: - name: KUBE_NODE_NAME valueFrom: @@ -41,8 +34,6 @@ spec: - name: registration-dir mountPath: /registration - name: gce-pd-driver - securityContext: - privileged: true # Don't change base image without changing pdImagePlaceholder in # test/k8s-integration/main.go image: gke.gcr.io/gcp-compute-persistent-disk-csi-driver @@ -50,25 +41,6 @@ spec: - "--v=5" - "--endpoint=unix:/csi/csi.sock" volumeMounts: - - name: kubelet-dir - mountPath: /var/lib/kubelet - mountPropagation: "Bidirectional" - - name: plugin-dir - mountPath: /csi - - name: device-dir - mountPath: /dev - # The following mounts are required to trigger host udevadm from - # container - - name: udev-rules-etc - mountPath: /etc/udev - - name: udev-rules-lib - mountPath: /lib/udev - - name: udev-socket - mountPath: /run/udev - - name: sys - mountPath: /sys - nodeSelector: - kubernetes.io/os: linux volumes: - name: registration-dir hostPath: @@ -82,28 +54,6 @@ spec: hostPath: path: /var/lib/kubelet/plugins/pd.csi.storage.gke.io/ type: DirectoryOrCreate - - name: device-dir - hostPath: - path: /dev - type: Directory - # The following mounts are required to trigger host udevadm from - # container - - name: udev-rules-etc - hostPath: - path: /etc/udev - type: Directory - - name: udev-rules-lib - hostPath: - path: /lib/udev - type: Directory - - name: udev-socket - hostPath: - path: /run/udev - type: Directory - - name: sys - hostPath: - path: /sys - type: Directory # https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ # See "special case". This will tolerate everything. Node component should # be scheduled on all nodes. diff --git a/deploy/kubernetes/delete-driver.sh b/deploy/kubernetes/delete-driver.sh index 9ab6ffba79..87016b4eb4 100755 --- a/deploy/kubernetes/delete-driver.sh +++ b/deploy/kubernetes/delete-driver.sh @@ -13,11 +13,12 @@ set -o errexit readonly NAMESPACE="${GCE_PD_DRIVER_NAMESPACE:-gce-pd-csi-driver}" readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable}" readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver" +readonly OS="${OS:-linux}" source "${PKGDIR}/deploy/common.sh" ensure_kustomize -${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${DEPLOY_VERSION} | ${KUBECTL} delete -v="${VERBOSITY}" --ignore-not-found -f - +${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${OS}/${DEPLOY_VERSION} | ${KUBECTL} delete -v="${VERBOSITY}" --ignore-not-found -f - ${KUBECTL} delete secret cloud-sa -v="${VERBOSITY}" --ignore-not-found if [[ ${NAMESPACE} != "" && ${NAMESPACE} != "default" ]] && \ diff --git a/deploy/kubernetes/deploy-driver.sh b/deploy/kubernetes/deploy-driver.sh index d9e0143d5d..331b254e13 100755 --- a/deploy/kubernetes/deploy-driver.sh +++ b/deploy/kubernetes/deploy-driver.sh @@ -19,6 +19,7 @@ set -x readonly NAMESPACE="${GCE_PD_DRIVER_NAMESPACE:-gce-pd-csi-driver}" readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable}" readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver" +readonly OS="${OS:-linux}" source "${PKGDIR}/deploy/common.sh" print_usage() @@ -95,6 +96,6 @@ fi ${KUBECTL} version readonly tmp_spec=/tmp/gcp-compute-persistent-disk-csi-driver-specs-generated.yaml -${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${DEPLOY_VERSION} | tee $tmp_spec +${KUSTOMIZE_PATH} build ${PKGDIR}/deploy/kubernetes/overlays/${OS}/${DEPLOY_VERSION} | tee $tmp_spec ${KUBECTL} apply -v="${VERBOSITY}" -f $tmp_spec diff --git a/deploy/kubernetes/overlays/alpha/WARNING.md b/deploy/kubernetes/overlays/linux/alpha/WARNING.md similarity index 100% rename from deploy/kubernetes/overlays/alpha/WARNING.md rename to deploy/kubernetes/overlays/linux/alpha/WARNING.md diff --git a/deploy/kubernetes/overlays/alpha/kustomization.yaml b/deploy/kubernetes/overlays/linux/alpha/kustomization.yaml similarity index 100% rename from deploy/kubernetes/overlays/alpha/kustomization.yaml rename to deploy/kubernetes/overlays/linux/alpha/kustomization.yaml diff --git a/deploy/kubernetes/overlays/linux/base/enableHostNetwork.yaml b/deploy/kubernetes/overlays/linux/base/enableHostNetwork.yaml new file mode 100644 index 0000000000..adec7ac370 --- /dev/null +++ b/deploy/kubernetes/overlays/linux/base/enableHostNetwork.yaml @@ -0,0 +1,8 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + hostNetwork: true \ No newline at end of file diff --git a/deploy/kubernetes/overlays/linux/base/gcepd.yaml b/deploy/kubernetes/overlays/linux/base/gcepd.yaml new file mode 100644 index 0000000000..f9482737b0 --- /dev/null +++ b/deploy/kubernetes/overlays/linux/base/gcepd.yaml @@ -0,0 +1,67 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + nodeSelector: + kubernetes.io/os: linux + containers: + - name: gce-pd-driver + image: gke.gcr.io/gcp-compute-persistent-disk-csi-driver + securityContext: + privileged: true + volumeMounts: + - name: kubelet-dir + mountPath: /var/lib/kubelet + mountPropagation: "Bidirectional" + - name: plugin-dir + mountPath: /csi + - name: device-dir + mountPath: /dev + # The following mounts are required to trigger host udevadm from + # container + - name: udev-rules-etc + mountPath: /etc/udev + - name: udev-rules-lib + mountPath: /lib/udev + - name: udev-socket + mountPath: /run/udev + - name: sys + mountPath: /sys + volumes: + - name: registration-dir + hostPath: + path: /var/lib/kubelet/plugins_registry/ + type: Directory + - name: kubelet-dir + hostPath: + path: /var/lib/kubelet + type: Directory + - name: plugin-dir + hostPath: + path: /var/lib/kubelet/plugins/pd.csi.storage.gke.io/ + type: DirectoryOrCreate + - name: device-dir + hostPath: + path: /dev + type: Directory + # The following mounts are required to trigger host udevadm from + # container + - name: udev-rules-etc + hostPath: + path: /etc/udev + type: Directory + - name: udev-rules-lib + hostPath: + path: /lib/udev + type: Directory + - name: udev-socket + hostPath: + path: /run/udev + type: Directory + - name: sys + hostPath: + path: /sys + type: Directory \ No newline at end of file diff --git a/deploy/kubernetes/overlays/linux/base/kustomization.yaml b/deploy/kubernetes/overlays/linux/base/kustomization.yaml new file mode 100644 index 0000000000..bf036e1357 --- /dev/null +++ b/deploy/kubernetes/overlays/linux/base/kustomization.yaml @@ -0,0 +1,29 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +bases: +- ../../../base +patchesStrategicMerge: +- enableHostNetwork.yaml +- gcepd.yaml +- noderegistrar.yaml +images: +- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver + # Don't change stable image without changing pdImagePlaceholder in + # test/k8s-integration/main.go + newName: gke.gcr.io/gcp-compute-persistent-disk-csi-driver + newTag: "v0.7.0-gke.0" +- name: gke.gcr.io/csi-provisioner + newName: gke.gcr.io/csi-provisioner + newTag: "v1.5.0-gke.0" +- name: gke.gcr.io/csi-attacher + newName: gke.gcr.io/csi-attacher + newTag: "v2.1.1-gke.0" +- name: gke.gcr.io/csi-node-driver-registrar + newName: gke.gcr.io/csi-node-driver-registrar + newTag: "v1.2.0-gke.0" +- name: gke.gcr.io/csi-resizer + newName: gke.gcr.io/csi-resizer + newTag: "v0.4.0-gke.0" +- name: gke.gcr.io/csi-snapshotter + newName: gke.gcr.io/csi-snapshotter + newTag: "v2.1.1-gke.0" \ No newline at end of file diff --git a/deploy/kubernetes/overlays/linux/base/noderegistrar.yaml b/deploy/kubernetes/overlays/linux/base/noderegistrar.yaml new file mode 100644 index 0000000000..d128516579 --- /dev/null +++ b/deploy/kubernetes/overlays/linux/base/noderegistrar.yaml @@ -0,0 +1,13 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + containers: + - name: csi-driver-registrar + args: + - "--v=5" + - "--csi-address=/csi/csi.sock" + - "--kubelet-registration-path=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock" \ No newline at end of file diff --git a/deploy/kubernetes/overlays/dev/WARNING.md b/deploy/kubernetes/overlays/linux/dev/WARNING.md similarity index 70% rename from deploy/kubernetes/overlays/dev/WARNING.md rename to deploy/kubernetes/overlays/linux/dev/WARNING.md index f3191fb3a0..026a8d77ce 100644 --- a/deploy/kubernetes/overlays/dev/WARNING.md +++ b/deploy/kubernetes/overlays/linux/dev/WARNING.md @@ -5,11 +5,4 @@ BROKEN AT ANY TIME This is the absolute cutting edge development Driver, it is intended for testing and development only and can have vast differences in functionality/behavior/configuration. Use only to try the newest features that -are not guaranteed to work yet. - -APPROXIMATE CHANGELOG in latest: -* Topology -* RePD -* Volume ID Format Changed -* Node ID Format Changed -* Parameter "zone" Removed \ No newline at end of file +are not guaranteed to work yet. \ No newline at end of file diff --git a/deploy/kubernetes/overlays/dev/controller_always_pull.yaml b/deploy/kubernetes/overlays/linux/dev/controller_always_pull.yaml similarity index 100% rename from deploy/kubernetes/overlays/dev/controller_always_pull.yaml rename to deploy/kubernetes/overlays/linux/dev/controller_always_pull.yaml diff --git a/deploy/kubernetes/overlays/dev/kustomization.yaml b/deploy/kubernetes/overlays/linux/dev/kustomization.yaml similarity index 100% rename from deploy/kubernetes/overlays/dev/kustomization.yaml rename to deploy/kubernetes/overlays/linux/dev/kustomization.yaml diff --git a/deploy/kubernetes/overlays/dev/node_always_pull.yaml b/deploy/kubernetes/overlays/linux/dev/node_always_pull.yaml similarity index 100% rename from deploy/kubernetes/overlays/dev/node_always_pull.yaml rename to deploy/kubernetes/overlays/linux/dev/node_always_pull.yaml diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/README.md b/deploy/kubernetes/overlays/linux/prow-gke-release-staging-head/README.md similarity index 100% rename from deploy/kubernetes/overlays/prow-gke-release-staging-head/README.md rename to deploy/kubernetes/overlays/linux/prow-gke-release-staging-head/README.md diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml b/deploy/kubernetes/overlays/linux/prow-gke-release-staging-head/kustomization.yaml similarity index 98% rename from deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml rename to deploy/kubernetes/overlays/linux/prow-gke-release-staging-head/kustomization.yaml index a882ae3d80..bb4f82f769 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml +++ b/deploy/kubernetes/overlays/linux/prow-gke-release-staging-head/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: -- ../../base +- ../base images: - name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/README.md b/deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/README.md similarity index 100% rename from deploy/kubernetes/overlays/prow-gke-release-staging-rc/README.md rename to deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/README.md diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml b/deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml similarity index 100% rename from deploy/kubernetes/overlays/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml rename to deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml b/deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/kustomization.yaml similarity index 98% rename from deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml rename to deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/kustomization.yaml index ae61405a7e..0d93520b59 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml +++ b/deploy/kubernetes/overlays/linux/prow-gke-release-staging-rc/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: -- ../../base +- ../base images: - name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/linux/stable/kustomization.yaml similarity index 98% rename from deploy/kubernetes/overlays/stable/kustomization.yaml rename to deploy/kubernetes/overlays/linux/stable/kustomization.yaml index 9aac767659..fe0cbb0ade 100644 --- a/deploy/kubernetes/overlays/stable/kustomization.yaml +++ b/deploy/kubernetes/overlays/linux/stable/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: -- ../../base +- ../base images: - name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver # Don't change stable image without changing pdImagePlaceholder in diff --git a/deploy/kubernetes/overlays/windows/dev/gcepd.yaml b/deploy/kubernetes/overlays/windows/dev/gcepd.yaml new file mode 100644 index 0000000000..dd8d93385b --- /dev/null +++ b/deploy/kubernetes/overlays/windows/dev/gcepd.yaml @@ -0,0 +1,46 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + nodeSelector: + kubernetes.io/os: windows + containers: + - name: gce-pd-driver + image: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win + volumeMounts: + - name: kubelet-dir + mountPath: C:\var\lib\kubelet + mountPropagation: "None" + - name: plugin-dir + mountPath: C:\csi + - name: csi-proxy-disk-pipe + mountPath: \\.\pipe\csi-proxy-disk-v1alpha1 + - name: csi-proxy-volume-pipe + mountPath: \\.\pipe\csi-proxy-volume-v1alpha1 + - name: csi-proxy-filesystem-pipe + mountPath: \\.\pipe\csi-proxy-filesystem-v1alpha1 + volumes: + - name: csi-proxy-disk-pipe + hostPath: + path: \\.\pipe\csi-proxy-disk-v1alpha1 + type: "" + - name: csi-proxy-volume-pipe + hostPath: + path: \\.\pipe\csi-proxy-volume-v1alpha1 + type: "" + - name: csi-proxy-filesystem-pipe + hostPath: + path: \\.\pipe\csi-proxy-filesystem-v1alpha1 + type: "" + - name: registration-dir + hostPath: + path: C:\var\lib\kubelet\plugins_registry\ + - name: kubelet-dir + hostPath: + path: C:\var\lib\kubelet\ + - name: plugin-dir + hostPath: + path: C:\var\lib\kubelet\plugins\pd.csi.storage.gke.io\ \ No newline at end of file diff --git a/deploy/kubernetes/overlays/windows/dev/kustomization.yaml b/deploy/kubernetes/overlays/windows/dev/kustomization.yaml new file mode 100644 index 0000000000..2f45ca3bf0 --- /dev/null +++ b/deploy/kubernetes/overlays/windows/dev/kustomization.yaml @@ -0,0 +1,33 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +bases: +- ../../../base +patchesStrategicMerge: +- gcepd.yaml +- noderegistrar.yaml +images: +- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver + # Don't change stable image without changing pdImagePlaceholder in + # test/k8s-integration/main.go + newName: gke.gcr.io/gcp-compute-persistent-disk-csi-driver + newTag: "v0.7.0-gke.0" +- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win + # Temporarly set to the private repo. Will swtich to public one + # once it is available. + newName: gcr.io/jing-k8s-dev/gce-pd-windows-2019 + newTag: "0.2.0" +- name: gke.gcr.io/csi-provisioner + newName: gke.gcr.io/csi-provisioner + newTag: "v1.5.0-gke.0" +- name: gke.gcr.io/csi-attacher + newName: gke.gcr.io/csi-attacher + newTag: "v2.1.1-gke.0" +- name: gke.gcr.io/csi-node-driver-registrar + newName: gcr.io/k8s-staging-csi/csi-node-driver-registrar + newTag: "amd64-windows-v20200428-v1.3.0-26-g510710d5" +- name: gke.gcr.io/csi-resizer + newName: gke.gcr.io/csi-resizer + newTag: "v0.4.0-gke.0" +- name: gke.gcr.io/csi-snapshotter + newName: gke.gcr.io/csi-snapshotter + newTag: "v2.1.1-gke.0" diff --git a/deploy/kubernetes/overlays/windows/dev/noderegistrar.yaml b/deploy/kubernetes/overlays/windows/dev/noderegistrar.yaml new file mode 100644 index 0000000000..9906915427 --- /dev/null +++ b/deploy/kubernetes/overlays/windows/dev/noderegistrar.yaml @@ -0,0 +1,17 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + containers: + - name: csi-driver-registrar + args: + - --v=5 + - --csi-address=unix://C:\\csi\\csi.sock + - --kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\pd.csi.storage.gke.io\\csi.sock + lifecycle: + preStop: + exec: + command: ["cmd", "/c", "del C:\\registration\\pd.csi.storage.gke.io-reg.sock"] \ No newline at end of file diff --git a/test/k8s-integration/driver.go b/test/k8s-integration/driver.go index 28ac511861..5fbfe7077d 100644 --- a/test/k8s-integration/driver.go +++ b/test/k8s-integration/driver.go @@ -9,7 +9,7 @@ import ( ) func getOverlayDir(pkgDir, deployOverlayName string) string { - return filepath.Join(pkgDir, "deploy", "kubernetes", "overlays", deployOverlayName) + return filepath.Join(pkgDir, "deploy", "kubernetes", "overlays", "linux", deployOverlayName) } func installDriver(goPath, pkgDir, stagingImage, stagingVersion, deployOverlayName string, doDriverBuild bool) error {