Browse Source

remove containerd registries (#10738)

pull/10739/head
Kay Yan 9 months ago
committed by GitHub
parent
commit
565eab901b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 11 deletions
  1. 2
      docs/containerd.md
  2. 3
      roles/container-engine/containerd/defaults/main.yml
  3. 5
      tests/common/_docker_hub_registry_mirror.yml
  4. 3
      tests/files/packet_ubuntu22-calico-all-in-one.yml

2
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

3
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:

5
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:

3
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:

Loading…
Cancel
Save