Skip to content

Commit 38ba775

Browse files
bugfix: fix containerd config bug when registry like host:port/project (#2904)
Signed-off-by: xuesongzuo@yunify.com <xuesongzuo@yunify.com>
1 parent 782575f commit 38ba775

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

builtin/core/roles/cri/containerd/templates/config.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,27 +60,29 @@ state = "/run/containerd"
6060
[plugins."io.containerd.grpc.v1.cri".registry.configs]
6161
{{- end }}
6262
{{- if .image_registry.auth.registry | empty | not }}
63-
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .image_registry.auth.registry }}".auth]
63+
{{- $registry_parts := .image_registry.auth.registry | splitList "/" | first }}
64+
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ $registry_parts }}".auth]
6465
username = "{{ .image_registry.auth.username }}"
6566
password = "{{ .image_registry.auth.password }}"
66-
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .image_registry.auth.registry }}".tls]
67+
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ $registry_parts }}".tls]
6768
{{- if .image_registry.auth.ca_file | empty | not }}
68-
ca_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/ca.crt"
69+
ca_file = "/etc/containerd/certs.d/{{ $registry_parts }}/ca.crt"
6970
{{- end }}
7071
{{- if .image_registry.auth.cert_file | empty | not }}
71-
cert_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/server.crt"
72+
cert_file = "/etc/containerd/certs.d/{{ $registry_parts }}/server.crt"
7273
{{- end }}
7374
{{- if .image_registry.auth.key_file | empty | not }}
74-
key_file = "/etc/containerd/certs.d/{{ .image_registry.auth.registry }}/server.key"
75+
key_file = "/etc/containerd/certs.d/{{ $registry_parts }}/server.key"
7576
{{- end }}
7677
insecure_skip_verify = {{ .image_registry.auth.insecure | default true }}
7778
{{- end }}
7879
{{- if .cri.registry.auths | empty | not }}
7980
{{- range .cri.registry.auths }}
80-
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .repo }}".auth]
81+
{{- $parts := .repo | splitList "/" | first }}
82+
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ $parts }}".auth]
8183
username = "{{ .username }}"
8284
password = "{{ .password }}"
83-
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ .repo }}".tls]
85+
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ $parts }}".tls]
8486
{{- if .ca_file }}
8587
ca_file = {{ .ca_file }}
8688
{{- end }}

0 commit comments

Comments
 (0)