From c6c0bb254af668fa0f4d1f6e8377a5730eeb24ec Mon Sep 17 00:00:00 2001
From: David Zhu <dyzz@google.com>
Date: Fri, 21 Feb 2020 15:59:44 -0800
Subject: [PATCH] Update version of GCE PD CSI Driver deployed in tests

---
 .../storage-csi/gce-pd/controller_ss.yaml     | 12 +++++++----
 .../storage-csi/gce-pd/node_ds.yaml           | 20 ++++++++++++++++---
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
index c05cb4a4dd2..506f49b1267 100644
--- a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
+++ b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
@@ -13,11 +13,15 @@ spec:
       labels:
         app: gcp-compute-persistent-disk-csi-driver
     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 
       serviceAccountName: csi-gce-pd-controller-sa
       containers:
         - name: csi-snapshotter
-          # TODO: replace with official 2.0.0 release when ready
-          image: quay.io/k8scsi/csi-snapshotter:v2.0.0-rc2
+          image: quay.io/k8scsi/csi-snapshotter:v2.0.1
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -35,7 +39,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
-          image: gcr.io/gke-release/csi-attacher:v2.0.0-gke.0
+          image: gcr.io/gke-release/csi-attacher:v2.1.1-gke.0
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -51,7 +55,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: gce-pd-driver
-          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.0-gke.0
+          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.2-gke.0
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
index 333af5cbbae..2e34d524905 100644
--- a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
+++ b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
@@ -11,6 +11,11 @@ spec:
       labels:
         app: gcp-compute-persistent-disk-csi-driver
     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
       containers:
         - name: csi-driver-registrar
           image: gcr.io/gke-release/csi-node-driver-registrar:v1.2.0-gke.0
@@ -35,7 +40,7 @@ spec:
         - name: gce-pd-driver
           securityContext:
             privileged: true
-          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.0-gke.0
+          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.6.2-gke.0
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
@@ -47,7 +52,8 @@ spec:
               mountPath: /csi
             - name: device-dir
               mountPath: /dev
-            # The following mounts are required to trigger host udevadm from container
+            # The following mounts are required to trigger host udevadm from
+            # container
             - name: udev-rules-etc
               mountPath: /etc/udev
             - name: udev-rules-lib
@@ -73,7 +79,8 @@ spec:
           hostPath:
             path: /dev
             type: Directory
-        # The following mounts are required to trigger host udevadm from container
+        # The following mounts are required to trigger host udevadm from
+        # container
         - name: udev-rules-etc
           hostPath:
             path: /etc/udev
@@ -90,3 +97,10 @@ spec:
           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.
+      tolerations:
+      - operator: Exists
+      nodeSelector:
+        kubernetes.io/os: linux
\ No newline at end of file