containerd:增加配置项是否启用容器仓库镜像

pull/641/head
gjmzj 2019-07-15 00:15:25 +08:00
parent 6ec6e94dea
commit d662135334
2 changed files with 5 additions and 0 deletions

View File

@ -3,3 +3,6 @@ STORAGE_DIR: "/var/lib/containerd"
# 基础容器镜像 # 基础容器镜像
SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.1" SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.1"
# 启用容器仓库镜像
ENABLE_MIRROR_REGISTRY: true

View File

@ -49,6 +49,7 @@ oom_score = 0
bin_dir = "{{ bin_dir }}" bin_dir = "{{ bin_dir }}"
conf_dir = "/etc/cni/net.d" conf_dir = "/etc/cni/net.d"
conf_template = "" conf_template = ""
{% if ENABLE_MIRROR_REGISTRY %}
[plugins.cri.registry] [plugins.cri.registry]
[plugins.cri.registry.mirrors] [plugins.cri.registry.mirrors]
# reference from https://www.ilanni.com/?p=14534 # reference from https://www.ilanni.com/?p=14534
@ -73,6 +74,7 @@ oom_score = 0
"https://quay.azk8s.cn", "https://quay.azk8s.cn",
"https://quay.mirrors.ustc.edu.cn" "https://quay.mirrors.ustc.edu.cn"
] ]
{% endif %}
[plugins.cri.x509_key_pair_streaming] [plugins.cri.x509_key_pair_streaming]
tls_cert_file = "" tls_cert_file = ""
tls_key_file = "" tls_key_file = ""