Merge pull request #584 from saikat-royc/iss-583

Enable Volume expansion test for GKE PDCSI driver

Author: k8s-ci-robot

test/k8s-integration/driver-config.go

@@ -74,11 +74,8 @@ func generateDriverConfigFile(platform, pkgDir, storageClassFile, snapshotClassF
 	// TODO: Support adding/removing capabilities based on Kubernetes version.
 	switch deploymentStrat {
 	case "gke":
+		fallthrough
 	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)

test/k8s-integration/main.go

@@ -412,6 +412,12 @@ func generateGKETestSkip(clusterVersion string, use_gke_managed_driver bool) str
 		skipString = skipString + "|volumeMode\\sshould\\snot\\smount\\s/\\smap\\sunused\\svolumes\\sin\\sa\\spod"
 	}
 
+	// For GKE deployed PD CSI driver, resizer sidecar is enabled in 1.16.8-gke.3
+	if (use_gke_managed_driver && curVer.lessThan(mustParseVersion("1.16.8-gke.3"))) ||
+		(!use_gke_managed_driver && curVer.lessThan(mustParseVersion("1.16.0"))) {
+		skipString = skipString + "|allowExpansion"
+	}
+
 	// For GKE deployed PD CSI snapshot is enabled in 1.17.6-gke.4(and higher), 1.18.3-gke.0(and higher).
 	if (use_gke_managed_driver && curVer.lessThan(mustParseVersion("1.17.6-gke.4"))) ||
 		(!use_gke_managed_driver && (*curVer).lessThan(mustParseVersion("1.17.0"))) {