Merge pull request #909 from mattcary/containerd

use cos_containerd as default image

Author: k8s-ci-robot

test/k8s-integration/cluster.go

@@ -135,8 +135,9 @@ func clusterUpGCE(k8sDir, gceZone string, numNodes int, numWindowsNodes int, ima
 func setImageTypeEnvs(imageType string) error {
 	switch strings.ToLower(imageType) {
 	case "cos":
+	case "cos_containerd":
 	case "gci": // GCI/COS is default type and does not need env vars set
-	case "ubuntu":
+	case "ubuntu", "ubuntu_containerd":
 		return errors.New("setting environment vars for bringing up *ubuntu* cluster on GCE is unimplemented")
 		/* TODO(dyzz) figure out how to bring up a Ubuntu cluster on GCE. The below doesn't work.
 		err := os.Setenv("KUBE_OS_DISTRIBUTION", "ubuntu")

test/k8s-integration/main.go

@@ -47,7 +47,7 @@ var (
 	gkeClusterVer        = flag.String("gke-cluster-version", "", "version of Kubernetes master and node for gke")
 	numNodes             = flag.Int("num-nodes", 0, "the number of nodes in the test cluster")
 	numWindowsNodes      = flag.Int("num-windows-nodes", 0, "the number of Windows nodes in the test cluster")
-	imageType            = flag.String("image-type", "cos", "the image type to use for the cluster")
+	imageType            = flag.String("image-type", "cos_containerd", "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'")
 	gkeTestClusterPrefix = flag.String("gke-cluster-prefix", "pdcsi", "Prefix of GKE cluster names. A random suffix will be appended to form the full name.")
 	gkeTestClusterName   = flag.String("gke-cluster-name", "", "Name of existing cluster")
@@ -155,7 +155,7 @@ func main() {
 	if !*bringupCluster && *platform != "windows" {
 		ensureVariable(kubeFeatureGates, false, "kube-feature-gates set but not bringing up new cluster")
 	} else {
-		ensureVariable(imageType, true, "image type is a required flag. Available options include 'cos' and 'ubuntu'")
+		ensureVariable(imageType, true, "image type is a required flag. A good default is 'cos_containerd'")
 		if *isRegionalCluster {
 			klog.Error("is-regional-cluster can only be set when using an existing cluster")
 		}

test/run-k8s-integration-ci.sh

@@ -20,7 +20,7 @@ readonly kube_version=${GCE_PD_KUBE_VERSION:-master}
 readonly test_version=${TEST_VERSION:-master}
 readonly gce_zone=${GCE_CLUSTER_ZONE:-us-central1-b}
 readonly gce_region=${GCE_CLUSTER_REGION:-}
-readonly image_type=${IMAGE_TYPE:-cos}
+readonly image_type=${IMAGE_TYPE:-cos_containerd}
 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}

test/run-k8s-integration.sh

@@ -20,7 +20,7 @@ readonly kube_version=${GCE_PD_KUBE_VERSION:-master}
 readonly test_version=${TEST_VERSION:-master}
 readonly gce_zone=${GCE_CLUSTER_ZONE:-us-central1-b}
 readonly gce_region=${GCE_CLUSTER_REGION:-}
-readonly image_type=${IMAGE_TYPE:-cos}
+readonly image_type=${IMAGE_TYPE:-cos_containerd}
 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}