From abdcbb823589c2d76793fb2a4cb00fb098188de1 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 2 Mar 2022 11:51:06 -0500 Subject: [PATCH] Enable specifying pause image in containerd config.toml Signed-off-by: Davanum Srinivas --- build/dependencies.yaml | 6 ++++++ cluster/gce/gci/configure-helper.sh | 1 + cluster/gce/util.sh | 1 + 3 files changed, 8 insertions(+) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 9662e560f17..73255566482 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -152,6 +152,12 @@ dependencies: - name: "k8s.gcr.io/pause: dependents" version: 3.6 refPaths: + - path: cluster/gce/config-common.sh + match: k8s.gcr.io\/pause:\d+\.\d+ + - path: cluster/gce/gci/configure-helper.sh + match: k8s.gcr.io\/pause:\d+\.\d+ + - path: cluster/gce/windows/smoke-test.sh + match: k8s.gcr.io\/pause:\d+\.\d+ - path: cmd/kubeadm/app/constants/constants.go match: PauseVersion\s+= - path: cmd/kubeadm/app/util/template_test.go diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 7c982faf320..8fd68c66f5d 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3116,6 +3116,7 @@ oom_score = -999 [plugins."io.containerd.grpc.v1.cri"] stream_server_address = "127.0.0.1" max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144} + sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"k8s.gcr.io/pause:3.6"}" [plugins."io.containerd.grpc.v1.cri".cni] bin_dir = "${KUBE_HOME}/bin" conf_dir = "/etc/cni/net.d" diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 4bcacd1790e..1a439f7a1b4 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -1175,6 +1175,7 @@ CONTAINER_RUNTIME: $(yaml-quote "${CONTAINER_RUNTIME:-}") CONTAINER_RUNTIME_ENDPOINT: $(yaml-quote "${CONTAINER_RUNTIME_ENDPOINT:-}") CONTAINER_RUNTIME_NAME: $(yaml-quote "${CONTAINER_RUNTIME_NAME:-}") CONTAINER_RUNTIME_TEST_HANDLER: $(yaml-quote "${CONTAINER_RUNTIME_TEST_HANDLER:-}") +CONTAINER_INFRA_CONTAINER: $(yaml-quote "${CONTAINER_INFRA_CONTAINER:-}") UBUNTU_INSTALL_CONTAINERD_VERSION: $(yaml-quote "${UBUNTU_INSTALL_CONTAINERD_VERSION:-}") UBUNTU_INSTALL_RUNC_VERSION: $(yaml-quote "${UBUNTU_INSTALL_RUNC_VERSION:-}") NODE_LOCAL_SSDS_EXT: $(yaml-quote "${NODE_LOCAL_SSDS_EXT:-}")