Skip to content

use cos_containerd as default image #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2022
Merged

use cos_containerd as default image #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test/k8s-integration/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions test/k8s-integration/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion test/run-k8s-integration-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion test/run-k8s-integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down