From 4fa500f7265eb943c538afb94b4fbab15e2ff3f8 Mon Sep 17 00:00:00 2001 From: Saikat Roychowdhury Date: Fri, 11 Dec 2020 21:58:39 +0000 Subject: [PATCH] Fix GKE cluster version check for cluster update --- test/k8s-integration/cluster.go | 2 +- test/k8s-integration/version_test.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/k8s-integration/cluster.go b/test/k8s-integration/cluster.go index e1ba5d752..6c5cf01e3 100644 --- a/test/k8s-integration/cluster.go +++ b/test/k8s-integration/cluster.go @@ -397,6 +397,6 @@ func getKubeClient() (kubernetes.Interface, error) { func isGKEDeploymentInstalledByDefault(clusterVersion string) bool { cv := mustParseVersion(clusterVersion) return cv.atLeast(mustParseVersion("1.18.10-gke.2101")) && - cv.lessThan(mustParseVersion("1.19")) || + cv.lessThan(mustParseVersion("1.19.0")) || cv.atLeast(mustParseVersion("1.19.3-gke.2100")) } diff --git a/test/k8s-integration/version_test.go b/test/k8s-integration/version_test.go index 1bbf88075..479920576 100644 --- a/test/k8s-integration/version_test.go +++ b/test/k8s-integration/version_test.go @@ -54,6 +54,12 @@ func TestParseVersion(t *testing.T) { version: [4]int{10, 18, 10, 10}, }, }, + { + version: "v1.19.0", + expectedV: version{ + version: [4]int{1, 19, 0, -1}, + }, + }, { version: "100.101.102-gke.103", expectedV: version{