15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fix containerd does not apply insecureRegistries in config.toml

This commit is contained in:
hellocn9 2022-05-09 17:00:12 +08:00
parent 8c7bb1d6ba
commit 8688c04fab
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/container/module.go
View File

@ -196,7 +196,7 @@ func InstallContainerd(m *InstallContainerModule) []task.Interface {
Dst: filepath.Join("/etc/containerd/", templates.ContainerdConfig.Name()),
Data: util.Data{
"Mirrors": templates.Mirrors(m.KubeConf),
"InsecureRegistries": templates.InsecureRegistries(m.KubeConf),
"InsecureRegistries": m.KubeConf.Cluster.Registry.InsecureRegistries,
"SandBoxImage": images.GetImage(m.Runtime, m.KubeConf, "pause").ImageName(),
"Auths": registry.DockerRegistryAuthEntries(m.KubeConf.Cluster.Registry.Auths),
},

4
pkg/container/templates/containerd_config.go
View File

@ -79,6 +79,10 @@ state = "/run/containerd"
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
endpoint = ["https://registry-1.docker.io"]
{{- end}}
{{- range $value := .InsecureRegistries }}
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{$value}}"]
endpoint = ["http://{{$value}}"]
{{- end}}
{{- if .Auths }}
[plugins."io.containerd.grpc.v1.cri".registry.configs]