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

bugfix: fix containerd config bug when registry like host:port/project (#2904) 

Signed-off-by: xuesongzuo@yunify.com <xuesongzuo@yunify.com>
This commit is contained in:
zuoxuesong-worker 2025-12-22 14:56:32 +08:00 committed by GitHub
parent 782575f49c
commit 38ba775eba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/core/roles/cri/containerd/templates/config.toml
View File

@ -60,27 +60,29 @@ state = "/run/containerd"
[plugins."io.containerd.grpc.v1.cri".registry.configs] [plugins."io.containerd.grpc.v1.cri".registry.configs]
{{- end }} {{- end }}
{{- if .image_registry.auth.registry | empty | not }} {{- if .image_registry.auth.registry | empty | not }}
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .image_registry.auth.registry }}".auth] {{- $registry_parts := .image_registry.auth.registry | splitList "/" | first }}
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ $registry_parts }}".auth]
username = "{{ .image_registry.auth.username }}" username = "{{ .image_registry.auth.username }}"
password = "{{ .image_registry.auth.password }}" password = "{{ .image_registry.auth.password }}"
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .image_registry.auth.registry }}".tls] [plugins."io.containerd.grpc.v1.cri".registry.configs."{{ $registry_parts }}".tls]
{{- if .image_registry.auth.ca_file | empty | not }} {{- if .image_registry.auth.ca_file | empty | not }}
ca_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/ca.crt" ca_file = "/etc/containerd/certs.d/{{ $registry_parts }}/ca.crt"
{{- end }} {{- end }}
{{- if .image_registry.auth.cert_file | empty | not }} {{- if .image_registry.auth.cert_file | empty | not }}
cert_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/server.crt" cert_file = "/etc/containerd/certs.d/{{ $registry_parts }}/server.crt"
{{- end }} {{- end }}
{{- if .image_registry.auth.key_file | empty | not }} {{- if .image_registry.auth.key_file | empty | not }}
key_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/server.key" key_file = "/etc/containerd/certs.d/{{ $registry_parts }}/server.key"
{{- end }} {{- end }}
insecure_skip_verify = {{ .image_registry.auth.insecure | default true }} insecure_skip_verify = {{ .image_registry.auth.insecure | default true }}
{{- end }} {{- end }}
{{- if .cri.registry.auths | empty | not }} {{- if .cri.registry.auths | empty | not }}
{{- range .cri.registry.auths }} {{- range .cri.registry.auths }}
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .repo }}".auth] {{- $parts := .repo | splitList "/" | first }}
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ $parts }}".auth]
username = "{{ .username }}" username = "{{ .username }}"
password = "{{ .password }}" password = "{{ .password }}"
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .repo }}".tls] [plugins."io.containerd.grpc.v1.cri".registry.configs."{{ $parts }}".tls]
{{- if .ca_file }} {{- if .ca_file }}
ca_file = {{ .ca_file }} ca_file = {{ .ca_file }}
{{- end }} {{- end }}