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

Author: verult

test/k8s-integration/cluster.go

@@ -10,7 +10,8 @@ import (
 	"strconv"
 	"strings"
 
-	apimachineryversion "k8s.io/apimachinery/pkg/version"
+	apimachineryversion "k8s.io/apimachinery/pkg/util/version"
+	apimachineryversiontypes "k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog"
@@ -182,11 +183,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
 }
 
@@ -326,8 +341,8 @@ func getKubeClusterVersion() (string, error) {
 		return "", fmt.Errorf("failed to obtain cluster version, error: %v", err)
 	}
 	type version struct {
-		ClientVersion *apimachineryversion.Info `json:"clientVersion,omitempty" yaml:"clientVersion,omitempty"`
-		ServerVersion *apimachineryversion.Info `json:"serverVersion,omitempty" yaml:"serverVersion,omitempty"`
+		ClientVersion *apimachineryversiontypes.Info `json:"clientVersion,omitempty" yaml:"clientVersion,omitempty"`
+		ServerVersion *apimachineryversiontypes.Info `json:"serverVersion,omitempty" yaml:"serverVersion,omitempty"`
 	}
 
 	var v version
@@ -379,3 +394,10 @@ func getKubeClient() (kubernetes.Interface, error) {
 	}
 	return kubeClient, nil
 }
+
+func isGKEDeploymentInstalledByDefault(clusterVersion string) bool {
+	cv := apimachineryversion.MustParseSemantic(clusterVersion)
+	return cv.AtLeast(apimachineryversion.MustParseSemantic("1.18.10-gke.2101")) &&
+		cv.LessThan(apimachineryversion.MustParseSemantic("1.19")) ||
+		cv.AtLeast(apimachineryversion.MustParseSemantic("1.19.3-gke.2100"))
+}