Merge pull request #679 from verult/disable-gke-deployment

disable gke deployment for clusters with installation by default if GKE deployment is not requested

Author: k8s-ci-robot

test/k8s-integration/cluster.go

@@ -182,11 +182,25 @@ func clusterUpGKE(gceZone, gceRegion string, numNodes int, imageType string, use
 	}
 
 	cmd = exec.Command("gcloud", cmdParams...)
-	err = runCommand("Staring E2E Cluster on GKE", cmd)
+	err = runCommand("Starting E2E Cluster on GKE", cmd)
 	if err != nil {
 		return fmt.Errorf("failed to bring up kubernetes e2e cluster on gke: %v", err)
 	}
 
+	// Because gcloud cannot disable addons on cluster create, the deployment has
+	// to be disabled on update.
+	clusterVersion := mustGetKubeClusterVersion()
+	if !useManagedDriver && isGKEDeploymentInstalledByDefault(clusterVersion) {
+		cmd = exec.Command(
+			"gcloud", "beta", "container", "clusters", "update",
+			*gkeTestClusterName, locationArg, locationVal, "--quiet",
+			"--update-addons", "GcePersistentDiskCsiDriver=DISABLED")
+		err = runCommand("Updating E2E Cluster on GKE to disable driver deployment", cmd)
+		if err != nil {
+			return fmt.Errorf("failed to update kubernetes e2e cluster on gke: %v", err)
+		}
+	}
+
 	return nil
 }
 
@@ -379,3 +393,10 @@ func getKubeClient() (kubernetes.Interface, error) {
 	}
 	return kubeClient, nil
 }
+
+func isGKEDeploymentInstalledByDefault(clusterVersion string) bool {
+	cv := mustParseVersion(clusterVersion)
+	return cv.atLeast(mustParseVersion("1.18.10-gke.2101")) &&
+		cv.lessThan(mustParseVersion("1.19")) ||
+		cv.atLeast(mustParseVersion("1.19.3-gke.2100"))
+}

test/k8s-integration/version.go

@@ -105,6 +105,7 @@ func parseVersion(vs string) (*version, error) {
 	return &v, nil
 }
 
+// mustParseVersion parses a GKE cluster version.
 func mustParseVersion(version string) *version {
 	v, err := parseVersion(version)
 	if err != nil {
@@ -134,3 +135,8 @@ func (v *version) compare(right *version) int {
 func (v *version) lessThan(right *version) bool {
 	return v.compare(right) < 0
 }
+
+// Compare versions if left is greater than or equal to right.
+func (v *version) atLeast(right *version) bool {
+	return v.compare(right) >= 0
+}