remove containerd registries (#10738)

2023-12-21 17:01:12 +08:00 · 2023-12-21 17:01:12 +08:00 · 565eab901b
parent c3315ac742
commit 565eab901b
4 changed files with 2 additions and 11 deletions
--- a/docs/containerd.md
+++ b/docs/containerd.md
@ -44,6 +44,8 @@ containerd_registries_mirrors:
 image_command_tool: crictl
 ```

+The `containerd_registries` and `containerd_insecure_registries` configs are deprecated.
+
 ### Containerd Runtimes

 Containerd supports multiple runtime configurations that can be used with
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@ -48,9 +48,6 @@ containerd_metrics_address: ""

 containerd_metrics_grpc_histogram: false

-containerd_registries:
-  "docker.io": "https://registry-1.docker.io"
-
 containerd_registries_mirrors:
  - prefix: docker.io
    mirrors:
--- a/tests/common/_docker_hub_registry_mirror.yml
+++ b/tests/common/_docker_hub_registry_mirror.yml
@ -5,11 +5,6 @@ docker_registry_mirrors:
 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"
-
 containerd_registries_mirrors:
  - prefix: docker.io
    mirrors:
--- a/tests/files/packet_ubuntu22-calico-all-in-one.yml
+++ b/tests/files/packet_ubuntu22-calico-all-in-one.yml
@ -11,9 +11,6 @@ auto_renew_certificates: true
 kube_proxy_mode: iptables
 enable_nodelocaldns: False

-containerd_registries:
-  "docker.io": "https://mirror.gcr.io"
-
 containerd_registries_mirrors:
  - prefix: docker.io
    mirrors: