Merge pull request #683 from saikat-royc/fix-version-parse

k8s-ci-robot · web-flow · commit 0a1803585ff7 · 2020-12-11T14:51:26.000-08:00
Fix GKE cluster version check for cluster update
diff --git 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
@@ -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{

Original file line number	Diff line number	Diff line change
`@@ -397,6 +397,6 @@ func getKubeClient() (kubernetes.Interface, error) {`
`397`	`397`	`func isGKEDeploymentInstalledByDefault(clusterVersion string) bool {`
`398`	`398`	`cv := mustParseVersion(clusterVersion)`
`399`	`399`	`return cv.atLeast(mustParseVersion("1.18.10-gke.2101")) &&`
`400`		`- cv.lessThan(mustParseVersion("1.19")) \|\|`
	`400`	`+ cv.lessThan(mustParseVersion("1.19.0")) \|\|`
`401`	`401`	`cv.atLeast(mustParseVersion("1.19.3-gke.2100"))`
`402`	`402`	`}`