Remove mount options from tets config template

kubernetes-sigs · Nov 17, 2020 · b3586c5 · b3586c5
1 parent d085a29
commit b3586c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/test/k8s-integration/config/test-config-template.in b/test/k8s-integration/config/test-config-template.in
@@ -16,9 +16,6 @@ DriverInfo:
   StressTestOptions:
     NumPods: 10
     NumRestarts: 10
-  SupportedMountOption:
-    debug:
-    nouid32:
   SupportedSizeRange:
     Min: {{.MinimumVolumeSize}}
     Max: 64Ti

diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go
@@ -61,7 +61,7 @@ var (
 	testFocus = flag.String("test-focus", "External.Storage", "test focus for Kubernetes e2e")
 
 	// SA for dev overlay
-	devOverlaySA = flag.String("dev-overlay-sa", "gcp-filestore-csi-driver-sa@saikatroyc-gke-dev.iam.gserviceaccount.com", "default SA that will be plumbed to the GCE instances")
+	devOverlaySA = flag.String("dev-overlay-sa", "", "default SA that will be plumbed to the GCE instances")
 )
 
 const (

diff --git a/test/run-k8s-integration-local.sh b/test/run-k8s-integration-local.sh
@@ -10,8 +10,11 @@ expansion_test_focus="External.*Storage.*allowExpansion"
 # This version of the command builds and deploys the GCE PS CSI driver for dev overlay.
 # Points to a local K8s repository to get the e2e test binary, does not bring up
 # or tear down the kubernetes cluster. In addition, it runs a subset of tests based on the test focus ginkgo string.
-# E.g. run command: GCE_FS_CSI_STAGING_IMAGE=gcr.io/<your-gcp-project>/gcp-filestore-csi-driver KTOP=$GOPATH/src/k8s.io/kubernetes/ test/run-k8s-integration-local.sh | tee log
+# For 'dev' overlay, GCE_FS_DEV_OVERLAY_SA_NAME is expected to be set. If deploy/project_setup.sh is used to create the SA, it would be 'gcp-filestore-csi-driver-sa@<your-gcp-project>.iam.gserviceaccount.com'
+
+# E.g. run command: GCE_FS_CSI_STAGING_IMAGE=gcr.io/<your-gcp-project>/gcp-filestore-csi-driver KTOP=$GOPATH/src/k8s.io/kubernetes/ GCE_FS_DEV_OVERLAY_SA_NAME=gcp-filestore-csi-driver-sa@<your-gcp-project>.iam.gserviceaccount.com test/run-k8s-integration-local.sh | tee log
+
 ${PKGDIR}/bin/k8s-integration-test --run-in-prow=false \
 --staging-image=${GCE_FS_CSI_STAGING_IMAGE} \
---deploy-overlay-name=dev --bringup-cluster=false --teardown-cluster=false --teardown-driver=false --test-focus=${subpath_test_focus} --local-k8s-dir=$KTOP \
+--deploy-overlay-name=dev --dev-overlay-sa=${GCE_FS_DEV_OVERLAY_SA_NAME:-} --bringup-cluster=false --teardown-cluster=false --teardown-driver=false --test-focus=${subpath_test_focus} --local-k8s-dir=$KTOP \
 --do-driver-build=true --gce-zone="us-central1-b" --num-nodes=${NUM_NODES:-3}