Make driver test capabilities configurable and remove expansion from GKE tests

Author: davidz627

test/k8s-integration/config/test-config-template.in

@@ -12,20 +12,8 @@ DriverInfo:
     # xfs: XFS only available on Ubuntu
     # ntfs: NTFS only available on Windows
   Capabilities:
-    persistence: true
-    block:  true
-    fsGroup: true
-    exec: true
-    # snapshotDataSource:
-    # pvcDataSource:
-    multipods: true
-    # RWX:
-    controllerExpansion: true
-    nodeExpansion: true
-    # volumeLimits: # PD Supports volume limits but test is very slow
-    # singleNodeVolume:
-    topology: true
-    # dataSource:
+  {{range .Capabilities}}  {{ . }}: true
+  {{end}}
   SupportedMountOption:
     debug:
     nouid32:

test/k8s-integration/driver-config.go

@@ -2,13 +2,15 @@ package main
 
 import (
 	"bufio"
+	"fmt"
 	"os"
 	"path/filepath"
 	"text/template"
 )
 
 type driverConfig struct {
 	StorageClassFile string
+	Capabilities     []string
 }
 
 const (
@@ -19,7 +21,7 @@ const (
 
 // generateDriverConfigFile loads a testdriver config template and creates a file
 // with the test-specific configuration
-func generateDriverConfigFile(pkgDir, storageClassFile string) (string, error) {
+func generateDriverConfigFile(pkgDir, storageClassFile, deploymentStrat string) (string, error) {
 	// Load template
 	t, err := template.ParseFiles(filepath.Join(pkgDir, testConfigDir, configTemplateFile))
 	if err != nil {
@@ -37,9 +39,42 @@ func generateDriverConfigFile(pkgDir, storageClassFile string) (string, error) {
 	w := bufio.NewWriter(f)
 	defer w.Flush()
 
-	// Fill in template parameters
+	// Fill in template parameters. Capabilities can be found here:
+	// https://github.com/kubernetes/kubernetes/blob/b717be8269a4f381ab6c23e711e8924bc1f64c93/test/e2e/storage/testsuites/testdriver.go#L136
+	caps := []string{
+		"persistence",
+		"block",
+		"fsGroup",
+		"exec",
+		"multipods",
+		"topology",
+	}
+
+	/* Unsupported Capabilities:
+	   snapshotDataSource
+	   pvcDataSource
+	   RWX
+	   volumeLimits # PD Supports volume limits but test is very slow
+	   singleNodeVolume
+	   dataSource
+	*/
+
+	// TODO: Support adding/removing capabilities based on Kubernetes version.
+	switch deploymentStrat {
+	case "gke":
+	case "gce":
+		// TODO: OSS K8S supports volume expansion for CSI by default in 1.16+;
+		// however, at time of writing GKE does not support K8S 1.16+. Add these
+		// capabilities for both deployment strategies when GKE Supports CSI
+		// Expansion by default.
+		caps = append(caps, "controllerExpansion", "nodeExpansion")
+	default:
+		return "", fmt.Errorf("got unknown deployment strat %s, expected gce or gke", deploymentStrat)
+	}
+
 	params := driverConfig{
 		StorageClassFile: filepath.Join(pkgDir, testConfigDir, storageClassFile),
+		Capabilities:     caps,
 	}
 
 	// Write config file

test/k8s-integration/main.go

@@ -294,7 +294,7 @@ func handle() error {
 
 	// Run the tests using the testDir kubernetes
 	if len(*storageClassFile) != 0 {
-		err = runCSITests(pkgDir, testDir, *testFocus, *storageClassFile, cloudProviderArgs)
+		err = runCSITests(pkgDir, testDir, *testFocus, *storageClassFile, cloudProviderArgs, *deploymentStrat)
 	} else if *migrationTest {
 		err = runMigrationTests(pkgDir, testDir, *testFocus, cloudProviderArgs)
 	} else {
@@ -325,8 +325,8 @@ func runMigrationTests(pkgDir, testDir, testFocus string, cloudProviderArgs []st
 	return runTestsWithConfig(testDir, testFocus, "--storage.migratedPlugins=kubernetes.io/gce-pd", cloudProviderArgs)
 }
 
-func runCSITests(pkgDir, testDir, testFocus, storageClassFile string, cloudProviderArgs []string) error {
-	testDriverConfigFile, err := generateDriverConfigFile(pkgDir, storageClassFile)
+func runCSITests(pkgDir, testDir, testFocus, storageClassFile string, cloudProviderArgs []string, deploymentStrat string) error {
+	testDriverConfigFile, err := generateDriverConfigFile(pkgDir, storageClassFile, deploymentStrat)
 	if err != nil {
 		return err
 	}