From 34c14949fc8f6e2feb2b5ba7fba9aa417eaff5d0 Mon Sep 17 00:00:00 2001 From: Jing Xu Date: Wed, 22 Dec 2021 14:14:52 -0800 Subject: [PATCH] Change default runtime to containerd for Windows cluster change default runtime to containerd for windows Change-Id: I61949ae3687cddb7bfd00715a455ee5eed4da0db --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 5a5b6f43582..1b7a2fdff2b 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -99,7 +99,7 @@ export KUBELET_TEST_ARGS=${KUBE_KUBELET_EXTRA_ARGS:-} # Default container runtime export CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-containerd} # Default container runtime for windows -export WINDOWS_CONTAINER_RUNTIME=${KUBE_WINDOWS_CONTAINER_RUNTIME:-docker} +export WINDOWS_CONTAINER_RUNTIME=${KUBE_WINDOWS_CONTAINER_RUNTIME:-containerd} # Set default values with override if [[ "${CONTAINER_RUNTIME}" == "docker" ]]; then diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 4d9411311eb..a475d4f12df 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -109,7 +109,7 @@ export NODE_SERVICE_ACCOUNT=${KUBE_GCE_NODE_SERVICE_ACCOUNT:-default} # Default container runtime for linux export CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-containerd} # Default container runtime for windows -export WINDOWS_CONTAINER_RUNTIME=${KUBE_WINDOWS_CONTAINER_RUNTIME:-docker} +export WINDOWS_CONTAINER_RUNTIME=${KUBE_WINDOWS_CONTAINER_RUNTIME:-containerd} # Set default values with override if [[ "${CONTAINER_RUNTIME}" == "docker" ]]; then