From 951d70da5312d65f85658268a89c61f1fb037387 Mon Sep 17 00:00:00 2001 From: Saikat Roychowdhury Date: Tue, 18 Aug 2020 00:43:29 +0000 Subject: [PATCH] Enable Volume expansion test for GKE PDCSI driver --- test/k8s-integration/driver-config.go | 5 +---- test/k8s-integration/main.go | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/k8s-integration/driver-config.go b/test/k8s-integration/driver-config.go index 4d3a8bdd6..1e465b00c 100644 --- a/test/k8s-integration/driver-config.go +++ b/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) diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go index 0007dc602..7ba835ca2 100644 --- a/test/k8s-integration/main.go +++ b/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"))) {