e2e test should take GKE node version as an input

For GKE clusters, node-version flag can be provided during cluster
creation to specify worker node k8s version. This change is needed
to test node and master version skew combinations.

Author: saikat-royc

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...)

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")

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"

test/run-k8s-integration-local.sh

@@ -73,6 +73,24 @@ make -C "${PKGDIR}" test-k8s-integration
 # --gce-zone="us-central1-c" --num-nodes=${NUM_NODES:-3} --gke-release-channel="rapid" --deployment-strategy="gke" \
 # --use-gke-managed-driver=true --teardown-cluster=true
 
+# This version of the command brings up (and subsequently tears down) a GKE
+# cluster using a release channel, and a given worker node version and with managed GCE PersistentDisk CSI driver add-on enabled, and points to
+# the local K8s repository to get the e2e test binary.
+# ${PKGDIR}/bin/k8s-integration-test --run-in-prow=false --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
+# --test-focus="External.Storage.*snapshot" --local-k8s-dir=$KTOP --storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml \
+# --snapshotclass-file=pd-volumesnapshotclass.yaml --do-driver-build=false --teardown-driver=false \
+# --gce-zone="us-central1-c" --num-nodes=${NUM_NODES:-3} --gke-release-channel="rapid" --deployment-strategy="gke" \
+# --use-gke-managed-driver=true --teardown-cluster=true --node-version="1.16"
+
+# This version of the command brings up (and subsequently tears down) a GKE
+# cluster with managed GCE PersistentDisk CSI driver add-on enabled, and points to
+# the local K8s repository to get the e2e test binary.
+# ${PKGDIR}/bin/k8s-integration-test --run-in-prow=false --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
+# --test-focus="External.Storage.sc-balanced" --local-k8s-dir=$KTOP --storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml \
+# --snapshotclass-file=pd-volumesnapshotclass.yaml --do-driver-build=false --teardown-driver=false \
+# --gce-zone="us-central1-c" --num-nodes=${NUM_NODES:-3} --gke-cluster-version="latest" --deployment-strategy="gke" \
+# --use-gke-managed-driver=true --teardown-cluster=true --gke-node-version="1.16"
+
 # This version of the command does not build the driver or K8s, points to a
 # local K8s repo to get the e2e.test binary, and does not bring up or down the cluster
 

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"