From 38ba775ebaaa98e936bb26c749f0e2ff6dbc36a9 Mon Sep 17 00:00:00 2001 From: zuoxuesong-worker Date: Mon, 22 Dec 2025 14:56:32 +0800 Subject: [PATCH] bugfix: fix containerd config bug when registry like host:port/project (#2904) Signed-off-by: xuesongzuo@yunify.com --- .../roles/cri/containerd/templates/config.toml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/builtin/core/roles/cri/containerd/templates/config.toml b/builtin/core/roles/cri/containerd/templates/config.toml index 1d4f2750..9b22582e 100644 --- a/builtin/core/roles/cri/containerd/templates/config.toml +++ b/builtin/core/roles/cri/containerd/templates/config.toml @@ -60,27 +60,29 @@ state = "/run/containerd" [plugins."io.containerd.grpc.v1.cri".registry.configs] {{- end }} {{- 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 }}" 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 }} - ca_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/ca.crt" + ca_file = "/etc/containerd/certs.d/{{ $registry_parts }}/ca.crt" {{- end }} {{- 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 }} {{- 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 }} insecure_skip_verify = {{ .image_registry.auth.insecure | default true }} {{- end }} {{- if .cri.registry.auths | empty | not }} {{- 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 }}" 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 }} ca_file = {{ .ca_file }} {{- end }}