From 565eab901bfd11c033296b60072536b7199d10f3 Mon Sep 17 00:00:00 2001
From: Kay Yan <kay.yan@daocloud.io>
Date: Thu, 21 Dec 2023 17:01:12 +0800
Subject: [PATCH] remove containerd registries (#10738)
---
docs/containerd.md | 2 ++
roles/container-engine/containerd/defaults/main.yml | 3 ---
tests/common/_docker_hub_registry_mirror.yml | 5 -----
tests/files/packet_ubuntu22-calico-all-in-one.yml | 3 ---
4 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/docs/containerd.md b/docs/containerd.md
index 112c0fc1e..c9d18051a 100644
--- 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
diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index 2fb4afe90..fd36c50de 100644
--- 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:
diff --git a/tests/common/_docker_hub_registry_mirror.yml b/tests/common/_docker_hub_registry_mirror.yml
index db521d679..4280f9d8e 100644
--- 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:
diff --git a/tests/files/packet_ubuntu22-calico-all-in-one.yml b/tests/files/packet_ubuntu22-calico-all-in-one.yml
index 4c5b5d711..614cbeabc 100644
--- 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:
--
GitLab