From f9061def6cc8f459c897a4a698b5994a6ceda2dd Mon Sep 17 00:00:00 2001 From: Mauricio Poppe Date: Mon, 30 Aug 2021 19:11:56 +0000 Subject: [PATCH 1/2] Add node-driver-registrar registration mode setup in Windows & Linux --- deploy/kubernetes/base/node_linux/node.yaml | 7 ++++++ deploy/kubernetes/base/node_windows/node.yaml | 7 ++++++ deploy/kubernetes/images/stable/image.yaml | 2 +- .../overlays/stable-1-17/kustomization.yaml | 1 + .../no-node-driver-registrar-probe.yaml | 25 +++++++++++++++++++ .../overlays/stable-1-18/kustomization.yaml | 2 ++ .../no-node-driver-registrar-probe.yaml | 25 +++++++++++++++++++ .../overlays/stable-1-19/kustomization.yaml | 2 ++ .../no-node-driver-registrar-probe.yaml | 25 +++++++++++++++++++ 9 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 deploy/kubernetes/overlays/stable-1-17/no-node-driver-registrar-probe.yaml create mode 100644 deploy/kubernetes/overlays/stable-1-18/no-node-driver-registrar-probe.yaml create mode 100644 deploy/kubernetes/overlays/stable-1-19/no-node-driver-registrar-probe.yaml diff --git a/deploy/kubernetes/base/node_linux/node.yaml b/deploy/kubernetes/base/node_linux/node.yaml index 51b5c8b89..a746683a9 100644 --- a/deploy/kubernetes/base/node_linux/node.yaml +++ b/deploy/kubernetes/base/node_linux/node.yaml @@ -38,6 +38,13 @@ spec: mountPath: /csi - name: registration-dir mountPath: /registration + livenessProbe: + initialDelaySeconds: 3 + exec: + command: + - /csi-node-driver-registrar + - --kubelet-registration-path=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock + - --mode=kubelet-registration-probe - name: gce-pd-driver # Don't change base image without changing pdImagePlaceholder in # test/k8s-integration/main.go diff --git a/deploy/kubernetes/base/node_windows/node.yaml b/deploy/kubernetes/base/node_windows/node.yaml index 63c01a791..65bdbeb2f 100644 --- a/deploy/kubernetes/base/node_windows/node.yaml +++ b/deploy/kubernetes/base/node_windows/node.yaml @@ -39,6 +39,13 @@ spec: mountPath: /csi - name: registration-dir mountPath: /registration + livenessProbe: + initialDelaySeconds: 3 + exec: + command: + - /csi-node-driver-registrar.exe + - --kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\pd.csi.storage.gke.io\\csi.sock + - --mode=kubelet-registration-probe - name: gce-pd-driver # Don't change base image without changing pdImagePlaceholder in # test/k8s-integration/main.go diff --git a/deploy/kubernetes/images/stable/image.yaml b/deploy/kubernetes/images/stable/image.yaml index 108eda3de..ed50a9b3b 100644 --- a/deploy/kubernetes/images/stable/image.yaml +++ b/deploy/kubernetes/images/stable/image.yaml @@ -40,7 +40,7 @@ metadata: name: imagetag-csi-node-registrar imageTag: name: k8s.gcr.io/sig-storage/csi-node-driver-registrar - newTag: "v2.1.0" + newTag: "v2.3.0" --- apiVersion: builtin diff --git a/deploy/kubernetes/overlays/stable-1-17/kustomization.yaml b/deploy/kubernetes/overlays/stable-1-17/kustomization.yaml index 646021c7d..c33410d0c 100644 --- a/deploy/kubernetes/overlays/stable-1-17/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable-1-17/kustomization.yaml @@ -9,5 +9,6 @@ resources: patchesStrategicMerge: - no_win_roles.yaml - no_v1_csidriver.yaml +- no-node-driver-registrar-probe.yaml transformers: - ../../images/stable-1-17 diff --git a/deploy/kubernetes/overlays/stable-1-17/no-node-driver-registrar-probe.yaml b/deploy/kubernetes/overlays/stable-1-17/no-node-driver-registrar-probe.yaml new file mode 100644 index 000000000..bb5dfe96b --- /dev/null +++ b/deploy/kubernetes/overlays/stable-1-17/no-node-driver-registrar-probe.yaml @@ -0,0 +1,25 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node-win +spec: + template: + spec: + containers: + - name: csi-driver-registrar + # introduced in node-driver-registrar v2.3.0 + livenessProbe: + $patch: delete +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + containers: + - name: csi-driver-registrar + # introduced in node-driver-registrar v2.3.0 + livenessProbe: + $patch: delete diff --git a/deploy/kubernetes/overlays/stable-1-18/kustomization.yaml b/deploy/kubernetes/overlays/stable-1-18/kustomization.yaml index decf1f786..09543ee61 100644 --- a/deploy/kubernetes/overlays/stable-1-18/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable-1-18/kustomization.yaml @@ -4,5 +4,7 @@ namespace: gce-pd-csi-driver resources: - ../../base +patchesStrategicMerge: +- no-node-driver-registrar-probe.yaml transformers: - ../../images/stable-1-18 diff --git a/deploy/kubernetes/overlays/stable-1-18/no-node-driver-registrar-probe.yaml b/deploy/kubernetes/overlays/stable-1-18/no-node-driver-registrar-probe.yaml new file mode 100644 index 000000000..bb5dfe96b --- /dev/null +++ b/deploy/kubernetes/overlays/stable-1-18/no-node-driver-registrar-probe.yaml @@ -0,0 +1,25 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node-win +spec: + template: + spec: + containers: + - name: csi-driver-registrar + # introduced in node-driver-registrar v2.3.0 + livenessProbe: + $patch: delete +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + containers: + - name: csi-driver-registrar + # introduced in node-driver-registrar v2.3.0 + livenessProbe: + $patch: delete diff --git a/deploy/kubernetes/overlays/stable-1-19/kustomization.yaml b/deploy/kubernetes/overlays/stable-1-19/kustomization.yaml index b776204b2..965394dc4 100644 --- a/deploy/kubernetes/overlays/stable-1-19/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable-1-19/kustomization.yaml @@ -4,5 +4,7 @@ namespace: gce-pd-csi-driver resources: - ../../base/ +patchesStrategicMerge: +- no-node-driver-registrar-probe.yaml transformers: - ../../images/stable-1-19 diff --git a/deploy/kubernetes/overlays/stable-1-19/no-node-driver-registrar-probe.yaml b/deploy/kubernetes/overlays/stable-1-19/no-node-driver-registrar-probe.yaml new file mode 100644 index 000000000..bb5dfe96b --- /dev/null +++ b/deploy/kubernetes/overlays/stable-1-19/no-node-driver-registrar-probe.yaml @@ -0,0 +1,25 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node-win +spec: + template: + spec: + containers: + - name: csi-driver-registrar + # introduced in node-driver-registrar v2.3.0 + livenessProbe: + $patch: delete +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + containers: + - name: csi-driver-registrar + # introduced in node-driver-registrar v2.3.0 + livenessProbe: + $patch: delete From 1ae756af2c319bb2c225abd07147dc950e572f2c Mon Sep 17 00:00:00 2001 From: Mauricio Poppe Date: Wed, 20 Oct 2021 23:51:24 +0000 Subject: [PATCH 2/2] Enable these changes only in prow-gke-release-staging-rc-master --- .../image.yaml | 2 +- deploy/kubernetes/images/stable/image.yaml | 2 +- .../overlays/stable-master/kustomization.yaml | 2 ++ .../no-node-driver-registrar-probe.yaml | 27 +++++++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 deploy/kubernetes/overlays/stable-master/no-node-driver-registrar-probe.yaml diff --git a/deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml b/deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml index bbac596f7..bac1b08ba 100644 --- a/deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml +++ b/deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml @@ -43,7 +43,7 @@ metadata: name: imagetag-csi-node-registrar-prow-rc imageTag: name: k8s.gcr.io/sig-storage/csi-node-driver-registrar - newTag: "v2.1.0" + newTag: "v2.3.0" --- apiVersion: builtin diff --git a/deploy/kubernetes/images/stable/image.yaml b/deploy/kubernetes/images/stable/image.yaml index ed50a9b3b..108eda3de 100644 --- a/deploy/kubernetes/images/stable/image.yaml +++ b/deploy/kubernetes/images/stable/image.yaml @@ -40,7 +40,7 @@ metadata: name: imagetag-csi-node-registrar imageTag: name: k8s.gcr.io/sig-storage/csi-node-driver-registrar - newTag: "v2.3.0" + newTag: "v2.1.0" --- apiVersion: builtin diff --git a/deploy/kubernetes/overlays/stable-master/kustomization.yaml b/deploy/kubernetes/overlays/stable-master/kustomization.yaml index 66a44c0e2..96ed93d4a 100644 --- a/deploy/kubernetes/overlays/stable-master/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable-master/kustomization.yaml @@ -4,5 +4,7 @@ namespace: gce-pd-csi-driver resources: - ../../base +patchesStrategicMerge: +- no-node-driver-registrar-probe.yaml transformers: - ../../images/stable-master diff --git a/deploy/kubernetes/overlays/stable-master/no-node-driver-registrar-probe.yaml b/deploy/kubernetes/overlays/stable-master/no-node-driver-registrar-probe.yaml new file mode 100644 index 000000000..516ad2609 --- /dev/null +++ b/deploy/kubernetes/overlays/stable-master/no-node-driver-registrar-probe.yaml @@ -0,0 +1,27 @@ +# TODO(mauriciopoppe): remove this file once testgrid is green with +# prow-gke-release-staging-rc-master +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node-win +spec: + template: + spec: + containers: + - name: csi-driver-registrar + # introduced in node-driver-registrar v2.3.0 + livenessProbe: + $patch: delete +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-node +spec: + template: + spec: + containers: + - name: csi-driver-registrar + # introduced in node-driver-registrar v2.3.0 + livenessProbe: + $patch: delete