Skip to content

Commit

Permalink
docs: update registry config guide
Browse files Browse the repository at this point in the history
Signed-off-by: Shuaiyi Zhang <zhang_syi@qq.com>
  • Loading branch information
ZhangShuaiyi committed Apr 15, 2024
1 parent 8eb03f1 commit 08ffc0a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions docs/cri/config.md
Expand Up @@ -433,9 +433,9 @@ version = 2
# * cni - use the order returned by the CNI plugins, returning the first IP address from the results
ip_pref = "ipv4"

# 'plugins."io.containerd.grpc.v1.cri".image_decryption' contains config related
# 'plugins."io.containerd.cri.v1.images".image_decryption' contains config related
# to handling decryption of encrypted container images.
[plugins."io.containerd.grpc.v1.cri".image_decryption]
[plugins."io.containerd.cri.v1.images".image_decryption]
# key_model defines the name of the key model used for how the cri obtains
# keys used for decryption of encrypted container images.
# The [decryption document](https://github.com/containerd/containerd/blob/main/docs/cri/decryption.md)
Expand All @@ -455,9 +455,9 @@ version = 2
# * Containerd imgcrypt: https://github.com/containerd/imgcrypt
key_model = "node"

# 'plugins."io.containerd.grpc.v1.cri".registry' contains config related to
# 'plugins."io.containerd.cri.v1.images".registry' contains config related to
# the registry
[plugins."io.containerd.grpc.v1.cri".registry]
[plugins."io.containerd.cri.v1.images".registry]
# config_path specifies a directory to look for the registry hosts configuration.
#
# The cri plugin will look for and use config_path/host-namespace/hosts.toml
Expand Down
16 changes: 8 additions & 8 deletions docs/cri/registry.md
Expand Up @@ -6,7 +6,7 @@ This document describes the method to configure the image registry for `containe
> have been DEPRECATED. As described in [the cri config](./config.md#registry-configuration) you
> should now use the following configuration
```toml
[plugins."io.containerd.grpc.v1.cri".registry]
[plugins."io.containerd.cri.v1.images".registry]
config_path = "/etc/containerd/certs.d"
```

Expand All @@ -26,7 +26,7 @@ version = 2

# The registry host has to be a domain name or IP. Port number is also
# needed if the default HTTPS or HTTP port is not used.
[plugins."io.containerd.grpc.v1.cri".registry.configs."gcr.io".auth]
[plugins."io.containerd.cri.v1.images".registry.configs."gcr.io".auth]
username = ""
password = ""
auth = ""
Expand Down Expand Up @@ -79,14 +79,14 @@ requests:
```toml
version = 2

[plugins."io.containerd.grpc.v1.cri".registry]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
[plugins."io.containerd.cri.v1.images".registry]
[plugins."io.containerd.cri.v1.images".registry.mirrors]
[plugins."io.containerd.cri.v1.images".registry.mirrors."docker.io"]
endpoint = ["https://registry-1.docker.io"]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."gcr.io"]
[plugins."io.containerd.cri.v1.images".registry.mirrors."gcr.io"]
endpoint = ["https://gcr.io"]
[plugins."io.containerd.grpc.v1.cri".registry.configs]
[plugins."io.containerd.grpc.v1.cri".registry.configs."gcr.io".auth]
[plugins."io.containerd.cri.v1.images".registry.configs]
[plugins."io.containerd.cri.v1.images".registry.configs."gcr.io".auth]
username = "_json_key"
password = 'paste output from jq'
```
Expand Down
2 changes: 1 addition & 1 deletion docs/hosts.md
Expand Up @@ -36,7 +36,7 @@ Modify your `config.toml` (default location: `/etc/containerd/config.toml`) as f
```toml
version = 2

[plugins."io.containerd.grpc.v1.cri".registry]
[plugins."io.containerd.cri.v1.images".registry]
config_path = "/etc/containerd/certs.d"
```

Expand Down

0 comments on commit 08ffc0a

Please sign in to comment.