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

Update after review

Browse Source 
Review comments:
- https://github.com/containerd/cri/pull/1591#pullrequestreview-499636859

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
This commit is contained in:
Martin Hickey 2020-09-30 19:00:08 +00:00
parent 70a56ae327
commit fe5fdccdaf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/registry.md
View File

@ -78,6 +78,7 @@ version = 2
``` ```
To skip the registry certificate verification: To skip the registry certificate verification:
```toml ```toml
# explicitly use v2 config format # explicitly use v2 config format
version = 2 version = 2
@ -114,7 +115,7 @@ not specified by Kubernetes via CRI.
After modifying this config, you need to restart the `containerd` service. After modifying this config, you need to restart the `containerd` service.
### Configure Registry Credentials Example - GCR with service account key authentication ### Configure Registry Credentials Example - GCR with Service Account Key Authentication
If you don't already have Google Container Registry (GCR) set-up then you need to do the following steps: If you don't already have Google Container Registry (GCR) set-up then you need to do the following steps:
@ -126,7 +127,7 @@ If you don't already have Google Container Registry (GCR) set-up then you need t
Refer to [Pushing and pulling images](https://cloud.google.com/container-registry/docs/pushing-and-pulling) for detailed information on the above steps. Refer to [Pushing and pulling images](https://cloud.google.com/container-registry/docs/pushing-and-pulling) for detailed information on the above steps.
> Note: The JSON key file is a multi-line file and can be cumbersome to use its contents as a key outside of file. It is worthwhile generating a single line format output of the file. One way of doing this is using the `jq` tool as follows: `jq -c . key.json` > Note: The JSON key file is a multi-line file and it can be cumbersome to use the contents as a key outside of the file. It is worthwhile generating a single line format output of the file. One way of doing this is using the `jq` tool as follows: `jq -c . key.json`
It is beneficial to first confirm that from your terminal you can authenticate with your GCR and have access to the storage before hooking it into containerd. This can be verified by performing a login to your GCR and It is beneficial to first confirm that from your terminal you can authenticate with your GCR and have access to the storage before hooking it into containerd. This can be verified by performing a login to your GCR and
pushing an image to it as follows: pushing an image to it as follows: