From d27c541b45d125db530d6212c1424d9f5c9fc7c2 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 4 Feb 2021 17:19:27 +0100
Subject: [PATCH] test: bump CSI container versions for mock testing

These are the latest stable releases. We should test with those.
The newer external-provisioner no longer needs (and doesn't support)
the --provisioner parameter.
---
 test/e2e/storage/utils/deployment.go                        | 5 -----
 .../testing-manifests/storage-csi/mock/csi-mock-driver.yaml | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/e2e/storage/utils/deployment.go b/test/e2e/storage/utils/deployment.go
index 4a2622d1f0c..e86812406cb 100644
--- a/test/e2e/storage/utils/deployment.go
+++ b/test/e2e/storage/utils/deployment.go
@@ -41,7 +41,6 @@ import (
 // that follow these conventions:
 // - driver and provisioner names are identical
 // - the driver binary accepts a --drivername parameter
-// - the provisioner binary accepts a --provisioner parameter
 // - the paths inside the container are either fixed
 //   and don't need to be patch (for example, --csi-address=/csi/csi.sock is
 //   okay) or are specified directly in a parameter (for example,
@@ -86,10 +85,6 @@ func PatchCSIDeployment(f *framework.Framework, o PatchCSIOptions, object interf
 			switch container.Name {
 			case o.DriverContainerName:
 				container.Args = append(container.Args, o.DriverContainerArguments...)
-			case o.ProvisionerContainerName:
-				// Driver name is expected to be the same
-				// as the provisioner here.
-				container.Args = append(container.Args, "--provisioner="+o.NewDriverName)
 			}
 		}
 	}
diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
index 81b2a22dcd4..13d97fb36b5 100644
--- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
+++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
@@ -15,13 +15,15 @@ spec:
       serviceAccountName: csi-mock
       containers:
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v1.6.0
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0
           args:
             - "--csi-address=$(ADDRESS)"
             # Topology support is needed for the pod rescheduling test
             # ("storage capacity" in csi_mock_volume.go).
             - "--feature-gates=Topology=true"
             - "-v=5"
+            # Needed for fsGroup support.
+            - "--default-fstype=ext4"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -29,7 +31,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
           args:
             - --v=5
             - --csi-address=/csi/csi.sock