github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1255 from Random-Liu/fix-doc

Browse Source 
FDQN is a typo, and we don't support trailing dot in FQDN.
This commit is contained in:
Lantao Liu 2019-08-30 14:58:22 -07:00 committed by GitHub
commit b5ec5ee4f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/registry.md
View File

@ -38,7 +38,7 @@ After modify this config, you need restart the `containerd` service.
To configure the TLS settings for a specific registry, create/modify the `/etc/containerd/config.toml` as follows: To configure the TLS settings for a specific registry, create/modify the `/etc/containerd/config.toml` as follows:
```toml ```toml
# The registry host has to be an FDQN or IP. # The registry host has to be an domain name or IP.
[plugins.cri.registry.configs."my.custom.registry".tls] [plugins.cri.registry.configs."my.custom.registry".tls]
ca_file = "ca.pem" ca_file = "ca.pem"
cert_file = "cert.pem" cert_file = "cert.pem"
@ -51,7 +51,7 @@ In the config example shown above, TLS mutual authentication will be used for co
`cert_file` and `key_file` are not needed when TLS mutual authentication is unused. `cert_file` and `key_file` are not needed when TLS mutual authentication is unused.
```toml ```toml
# The registry host has to be an FDQN or IP. # The registry host has to be an domain name or IP.
[plugins.cri.registry.configs."my.custom.registry".tls] [plugins.cri.registry.configs."my.custom.registry".tls]
ca_file = "ca.pem" ca_file = "ca.pem"
``` ```
@ -63,7 +63,7 @@ In the config example shown above, TLS mutual authentication will be used for co
To configure a credential for a specific registry, create/modify the To configure a credential for a specific registry, create/modify the
`/etc/containerd/config.toml` as follows: `/etc/containerd/config.toml` as follows:
```toml ```toml
# The registry host has to be an FDQN or IP. # The registry host has to be an domain name or IP.
[plugins.cri.registry.configs."gcr.io".auth] [plugins.cri.registry.configs."gcr.io".auth]
username = "" username = ""
password = "" password = ""

2
pkg/config/config.go
View File

@ -131,7 +131,7 @@ type Registry struct {
// Mirrors are namespace to mirror mapping for all namespaces. // Mirrors are namespace to mirror mapping for all namespaces.
Mirrors map[string]Mirror `toml:"mirrors" json:"mirrors"` Mirrors map[string]Mirror `toml:"mirrors" json:"mirrors"`
// Configs are configs for each registry. // Configs are configs for each registry.
// The key is the FDQN or IP of the registry. // The key is the domain name or IP of the registry.
Configs map[string]RegistryConfig `toml:"configs" json:"configs"` Configs map[string]RegistryConfig `toml:"configs" json:"configs"`
// Auths are registry endpoint to auth config mapping. The registry endpoint must // Auths are registry endpoint to auth config mapping. The registry endpoint must