fix-containerd-config_path

roles/container-engine/containerd/tasks/main.yml

@@ -120,7 +120,19 @@
   with_dict: "{{ containerd_insecure_registries }}"
   when: containerd_insecure_registries is defined
 
-- name: containerd ｜ Write hosts.toml file
+- name: containerd ｜ Write registries hosts.toml file
+  blockinfile:
+    path: "{{ containerd_cfg_dir }}/certs.d/{{ item.key }}/hosts.toml"
+    mode: 0640
+    create: true
+    block: |
+      server = "{{ item.value }}"
+      [host."{{ item.value }}"]
+        capabilities = ["pull", "resolve", "push"]
+  with_dict: "{{ containerd_registries }}"
+  when: containerd_registries is defined
+
+- name: containerd ｜ Write insecure registries hosts.toml file
   blockinfile:
     path: "{{ containerd_cfg_dir }}/certs.d/{{ item.key }}/hosts.toml"
     mode: 0640

roles/container-engine/containerd/templates/config.toml.j2

@@ -51,10 +51,6 @@ oom_score = {{ containerd_oom_score }}
       config_path = "{{ containerd_cfg_dir }}/certs.d"
 {% endif %}
       [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
-{% for registry, addr in containerd_registries.items() %}
-        [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{ registry }}"]
-          endpoint = ["{{ ([ addr ] | flatten ) | join('","') }}"]
-{% endfor %}
 {% for registry in containerd_registry_auth if registry['registry'] is defined %}
 {% if (registry['username'] is defined and registry['password'] is defined) or registry['auth'] is defined %}
       [plugins."io.containerd.grpc.v1.cri".registry.configs."{{ registry['registry'] }}".auth]

tests/common/_docker_hub_registry_mirror.yml

@@ -6,9 +6,7 @@ containerd_grpc_max_recv_message_size: 16777216
 containerd_grpc_max_send_message_size: 16777216
 
 containerd_registries:
-  "docker.io":
-    - "https://mirror.gcr.io"
-    - "https://registry-1.docker.io"
+  "docker.io": "https://mirror.gcr.io"
 
 containerd_max_container_log_line_size: -1