Skip to content

Commit

Permalink
Merge pull request #5254 from voltbit/clarify-cri-registry-doc
Browse files Browse the repository at this point in the history
Make CRI registry docs more clear
  • Loading branch information
mikebrow committed Mar 23, 2021
2 parents 2ad54a2 + e4b9b10 commit 664088d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docs/cri/registry.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

This document describes the method to configure the image registry for `containerd` for use with the `cri` plugin.

NOTE: The configuration syntax used in this doc is in version 2 which is the
recommended since `containerd` 1.3. If your configuration is still in version 1,
you can replace `"io.containerd.grpc.v1.cri"` with `cri`.

## Configure Registry Endpoint

With containerd, `docker.io` is the default image registry. You can also set up other image registries similar to docker.
Expand Down Expand Up @@ -185,3 +181,7 @@ DEBU[0000] PullImageRequest: &PullImageRequest{Image:&ImageSpec{Image:gcr.io/you
DEBU[0001] PullImageResponse: &PullImageResponse{ImageRef:sha256:78096d0a54788961ca68393e5f8038704b97d8af374249dc5c8faec1b8045e42,}
Image is up to date for sha256:78096d0a54788961ca68393e5f8038704b97d8af374249dc5c8faec1b8045e42
```

---

NOTE: The configuration syntax used in this doc is in version 2 which is the recommended since `containerd` 1.3. For the previous config format you can reference [https://github.com/containerd/cri/blob/release/1.2/docs/registry.md](https://github.com/containerd/cri/blob/release/1.2/docs/registry.md).

0 comments on commit 664088d

Please sign in to comment.