External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 01:28:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix containerd config_path mirrors and remove nerdctl insecure_registry (#10196)

Browse Source 
* Fix containerd_registries in config_path for mirrors and remove nerdctl global insecure_registry setting

* Make containerd hosts.toml mode 0640

* Add containerd_registries_mirrors and keep containerd_registries to pass packet_debian11-calico-upgrade
This commit is contained in:
yun
2023-08-16 20:18:27 +08:00
committed by GitHub
parent 4c37399c75
commit 77bda0df1c
13 changed files with 109 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/container-engine/nerdctl/templates/nerdctl.toml.j2
View File

@@ -6,5 +6,4 @@ snapshotter = "{{ nerdctl_snapshotter | default('overlayfs') }}"
cni_path = "/opt/cni/bin"
cni_netconfpath = "/etc/cni/net.d"
cgroup_manager = "{{ kubelet_cgroup_driver | default('systemd') }}"
insecure_registry = {{ (containerd_insecure_registries is defined and containerd_insecure_registries|length>0) | bool | lower }}
hosts_dir = ["/etc/containerd/certs.d"]
hosts_dir = ["{{ containerd_cfg_dir }}/certs.d"]