github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108456 from dims/enable-specifying-pause-image-in-containerd-config-toml

Browse Source 
Enable specifying pause image in containerd config.toml
This commit is contained in:
Kubernetes Prow Robot 2022-03-02 18:32:46 -08:00 committed by GitHub
commit 96656b0e3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/dependencies.yaml
View File

@ -152,6 +152,12 @@ dependencies:
- name: "k8s.gcr.io/pause: dependents" - name: "k8s.gcr.io/pause: dependents"
version: 3.6 version: 3.6
refPaths: 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 - path: cmd/kubeadm/app/constants/constants.go
match: PauseVersion\s+= match: PauseVersion\s+=
- path: cmd/kubeadm/app/util/template_test.go - path: cmd/kubeadm/app/util/template_test.go

1
cluster/gce/gci/configure-helper.sh
View File

@ -3116,6 +3116,7 @@ oom_score = -999
[plugins."io.containerd.grpc.v1.cri"] [plugins."io.containerd.grpc.v1.cri"]
stream_server_address = "127.0.0.1" stream_server_address = "127.0.0.1"
max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144} 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] [plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "${KUBE_HOME}/bin" bin_dir = "${KUBE_HOME}/bin"
conf_dir = "/etc/cni/net.d" conf_dir = "/etc/cni/net.d"

1
cluster/gce/util.sh
View File

@ -1175,6 +1175,7 @@ CONTAINER_RUNTIME: $(yaml-quote "${CONTAINER_RUNTIME:-}")
CONTAINER_RUNTIME_ENDPOINT: $(yaml-quote "${CONTAINER_RUNTIME_ENDPOINT:-}") CONTAINER_RUNTIME_ENDPOINT: $(yaml-quote "${CONTAINER_RUNTIME_ENDPOINT:-}")
CONTAINER_RUNTIME_NAME: $(yaml-quote "${CONTAINER_RUNTIME_NAME:-}") CONTAINER_RUNTIME_NAME: $(yaml-quote "${CONTAINER_RUNTIME_NAME:-}")
CONTAINER_RUNTIME_TEST_HANDLER: $(yaml-quote "${CONTAINER_RUNTIME_TEST_HANDLER:-}") 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_CONTAINERD_VERSION: $(yaml-quote "${UBUNTU_INSTALL_CONTAINERD_VERSION:-}")
UBUNTU_INSTALL_RUNC_VERSION: $(yaml-quote "${UBUNTU_INSTALL_RUNC_VERSION:-}") UBUNTU_INSTALL_RUNC_VERSION: $(yaml-quote "${UBUNTU_INSTALL_RUNC_VERSION:-}")
NODE_LOCAL_SSDS_EXT: $(yaml-quote "${NODE_LOCAL_SSDS_EXT:-}") NODE_LOCAL_SSDS_EXT: $(yaml-quote "${NODE_LOCAL_SSDS_EXT:-}")