mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Enable specifying pause image in containerd config.toml
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
parent
4737127b57
commit
abdcbb8235
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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:-}")
|
||||
|
Loading…
Reference in New Issue
Block a user