From add6e0d7bbbc5aed34011889f14c6f956c00f04a Mon Sep 17 00:00:00 2001
From: Cheng Xing <cxing@google.com>
Date: Tue, 4 Sep 2018 18:10:31 -0700
Subject: [PATCH] CSI e2e test: driver registrar updates for moving
 PluginWatcher to beta

---
 test/e2e/storage/csi_objects.go                  | 16 +++++++++++++++-
 .../storage-csi/gce-pd/node_ds.yaml              | 11 ++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/test/e2e/storage/csi_objects.go b/test/e2e/storage/csi_objects.go
index 15fd7cf3282..0478ea05478 100644
--- a/test/e2e/storage/csi_objects.go
+++ b/test/e2e/storage/csi_objects.go
@@ -41,7 +41,7 @@ var csiImageVersions = map[string]string{
 	"hostpathplugin":   "v0.2.0",
 	"csi-attacher":     "v0.2.0",
 	"csi-provisioner":  "v0.2.1",
-	"driver-registrar": "v0.2.0",
+	"driver-registrar": "v0.3.0",
 }
 
 func csiContainerImage(image string) string {
@@ -239,6 +239,7 @@ func csiHostPathPod(
 					Args: []string{
 						"--v=5",
 						"--csi-address=/csi/csi.sock",
+						"--kubelet-registration-path=/var/lib/kubelet/plugins/csi-hostpath/csi.sock",
 					},
 					Env: []v1.EnvVar{
 						{
@@ -255,6 +256,10 @@ func csiHostPathPod(
 							Name:      "socket-dir",
 							MountPath: "/csi",
 						},
+						{
+							Name:      "registration-dir",
+							MountPath: "/registration",
+						},
 					},
 				},
 				{
@@ -327,6 +332,15 @@ func csiHostPathPod(
 						},
 					},
 				},
+				{
+					Name: "registration-dir",
+					VolumeSource: v1.VolumeSource{
+						HostPath: &v1.HostPathVolumeSource{
+							Path: "/var/lib/kubelet/plugins",
+							Type: &hostPathType,
+						},
+					},
+				},
 				{
 					Name: "mountpoint-dir",
 					VolumeSource: v1.VolumeSource{
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 11890676e78..8bfa28bbd0b 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
@@ -16,13 +16,16 @@ spec:
       containers:
         - name: csi-driver-registrar
           imagePullPolicy: Always
-          image: quay.io/k8scsi/driver-registrar:v0.2.0
+          image: quay.io/k8scsi/driver-registrar:v0.3.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
+            - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
+            - name: DRIVER_REG_SOCK_PATH
+              value: /var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -30,6 +33,8 @@ spec:
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
+            - name: registration-dir
+              mountPath: /registration
         - name: gce-driver
           securityContext:
             privileged: true
@@ -63,6 +68,10 @@ spec:
           hostPath:
             path: /var/lib/kubelet/plugins/com.google.csi.gcepd/
             type: DirectoryOrCreate
+        - name: registration-dir
+          hostPath:
+            path: /var/lib/kubelet/plugins/
+            type: Directory
         - name: device-dir
           hostPath:
             path: /dev