diff --git a/test/k8s-integration/cluster.go b/test/k8s-integration/cluster.go index a3c30ffd2..f8a207832 100644 --- a/test/k8s-integration/cluster.go +++ b/test/k8s-integration/cluster.go @@ -167,6 +167,10 @@ func clusterUpGKE(gceZone, gceRegion string, numNodes int, imageType string, use cmdParams = append(cmdParams, "--enable-autorepair") } + if isVariableSet(gkeNodeVersion) { + cmdParams = append(cmdParams, "--node-version", *gkeNodeVersion) + } + if useManagedDriver { // PD CSI Driver add on is enabled only in gcloud beta. cmdParams = append([]string{"beta"}, cmdParams...) diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go index 81542bbd2..351f9b9cd 100644 --- a/test/k8s-integration/main.go +++ b/test/k8s-integration/main.go @@ -48,6 +48,7 @@ var ( imageType = flag.String("image-type", "cos", "the image type to use for the cluster") gkeReleaseChannel = flag.String("gke-release-channel", "", "GKE release channel to be used for cluster deploy. One of 'rapid', 'stable' or 'regular'") gkeTestClusterName = flag.String("gke-cluster-name", "gcp-pd-csi-driver-test-cluster", "GKE cluster name") + gkeNodeVersion = flag.String("gke-node-version", "", "GKE cluster worker node version") // Test infrastructure flags boskosResourceType = flag.String("boskos-resource-type", "gce-project", "name of the boskos resource type to reserve") diff --git a/test/run-k8s-integration-ci.sh b/test/run-k8s-integration-ci.sh index 6bec334a6..4f60d1992 100755 --- a/test/run-k8s-integration-ci.sh +++ b/test/run-k8s-integration-ci.sh @@ -23,6 +23,7 @@ readonly image_type=${IMAGE_TYPE:-cos} readonly use_gke_managed_driver=${USE_GKE_MANAGED_DRIVER:-false} readonly gke_release_channel=${GKE_RELEASE_CHANNEL:-""} readonly teardown_driver=${GCE_PD_TEARDOWN_DRIVER:-true} +readonly gke_node_version=${GKE_NODE_VERSION:-} export GCE_PD_VERBOSITY=9 @@ -57,4 +58,8 @@ else base_cmd="${base_cmd} --gce-region=${gce_region}" fi +if [ -z "$gke_node_version" ]; then + base_cmd="${base_cmd} --gke-node-version=${gke_node_version}" +fi + eval "$base_cmd" diff --git a/test/run-k8s-integration.sh b/test/run-k8s-integration.sh index 6167fdd6d..5d31be995 100755 --- a/test/run-k8s-integration.sh +++ b/test/run-k8s-integration.sh @@ -23,6 +23,7 @@ readonly image_type=${IMAGE_TYPE:-cos} readonly use_gke_managed_driver=${USE_GKE_MANAGED_DRIVER:-false} readonly gke_release_channel=${GKE_RELEASE_CHANNEL:-""} readonly teardown_driver=${GCE_PD_TEARDOWN_DRIVER:-true} +readonly gke_node_version=${GKE_NODE_VERSION:-} export GCE_PD_VERBOSITY=9 @@ -57,4 +58,7 @@ else base_cmd="${base_cmd} --gce-region=${gce_region}" fi +if [ -z "$gke_node_version" ]; then + base_cmd="${base_cmd} --gke-node-version=${gke_node_version}" +fi eval "$base_cmd"