Skip to content

Commit

Permalink
Update after review
Browse files Browse the repository at this point in the history
Review comments:
- containerd/cri#1591 (review)

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
  • Loading branch information
hickeyma committed Sep 30, 2020
1 parent 70a56ae commit fe5fdcc
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions docs/registry.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ version = 2
```

To skip the registry certificate verification:

```toml
# explicitly use v2 config format
version = 2
Expand Down Expand Up @@ -114,7 +115,7 @@ not specified by Kubernetes via CRI.

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:

Expand All @@ -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.

> 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
pushing an image to it as follows:
Expand Down

0 comments on commit fe5fdcc

Please sign in to comment.