From 75d8ea38bd50d1a462cb274dc8974871c1ace60a Mon Sep 17 00:00:00 2001 From: zuoxuesong-worker Date: Thu, 23 Oct 2025 15:06:27 +0800 Subject: [PATCH] feat: containerd add default cert config path (#2821) feat: containerd add default cert config path Signed-off-by: xuesongzuo@yunify.com --- .../core/roles/cri/containerd/templates/config.toml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/builtin/core/roles/cri/containerd/templates/config.toml b/builtin/core/roles/cri/containerd/templates/config.toml index 3d3afe98..acbeb607 100644 --- a/builtin/core/roles/cri/containerd/templates/config.toml +++ b/builtin/core/roles/cri/containerd/templates/config.toml @@ -47,6 +47,7 @@ state = "/run/containerd" max_conf_num = 1 conf_template = "" [plugins."io.containerd.grpc.v1.cri".registry] + config_path = "/etc/containerd/certs.d" [plugins."io.containerd.grpc.v1.cri".registry.mirrors] {{- if .cri.registry.mirrors | empty | not }} [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] @@ -63,15 +64,6 @@ state = "/run/containerd" username = "{{ .image_registry.auth.username }}" password = "{{ .image_registry.auth.password }}" [plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .image_registry.auth.registry }}".tls] -{{- if .image_registry.auth.ca_file | empty | not }} - ca_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/ca.crt" -{{- end }} -{{- if .image_registry.auth.cert_file | empty | not }} - cert_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/server.crt" -{{- end }} -{{- if .image_registry.auth.key_file | empty | not }} - key_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/server.key" -{{- end }} insecure_skip_verify = {{ .image_registry.auth.insecure | default true }} {{- if .cri.registry.auths | empty | not }} {{- range .cri.registry.auths }}