Skip to content

Commit 5d13b47

Browse files
committed
update registry.k8s.io references in configuration files and README
1 parent d1f5257 commit 5d13b47

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ docker run --rm --name docker_registry_proxy -it \
130130
-p 0.0.0.0:3128:3128 -e ENABLE_MANIFEST_CACHE=true \
131131
-v $(pwd)/docker_mirror_cache:/docker_mirror_cache \
132132
-v $(pwd)/docker_mirror_certs:/ca \
133-
-e REGISTRIES="k8s.gcr.io gcr.io quay.io your.own.registry another.public.registry" \
133+
-e REGISTRIES="registry.k8s.io gcr.io quay.io your.own.registry another.public.registry" \
134134
-e AUTH_REGISTRIES="auth.docker.io:dockerhub_username:dockerhub_password your.own.registry:username:password" \
135135
rpardini/docker-registry-proxy:0.6.2
136136
```
@@ -179,7 +179,7 @@ docker run --rm --name docker_registry_proxy -it \
179179
-p 0.0.0.0:3128:3128 -e ENABLE_MANIFEST_CACHE=true \
180180
-v $(pwd)/docker_mirror_cache:/docker_mirror_cache \
181181
-v $(pwd)/docker_mirror_certs:/ca \
182-
-e REGISTRIES="k8s.gcr.io gcr.io quay.io your.own.registry another.public.registry" \
182+
-e REGISTRIES="registry.k8s.io gcr.io quay.io your.own.registry another.public.registry" \
183183
-e AUTH_REGISTRIES_DELIMITER=";;;" \
184184
-e AUTH_REGISTRY_DELIMITER=":::" \
185185
-e AUTH_REGISTRIES="gcr.io:::_json_key:::$(cat servicekey.json);;;auth.docker.io:::dockerhub_username:::dockerhub_password" \
@@ -316,7 +316,7 @@ systemctl restart docker.service
316316

317317
Clear `dockerd` of everything not currently running: `docker system prune -a -f` *beware*
318318

319-
Then do, for example, `docker pull k8s.gcr.io/kube-proxy-amd64:v1.10.4` and watch the logs on the caching proxy, it should list a lot of MISSes.
319+
Then do, for example, `docker pull registry.k8s.io/kube-proxy-amd64:v1.10.4` and watch the logs on the caching proxy, it should list a lot of MISSes.
320320

321321
Then, clean again, and pull again. You should see HITs! Success.
322322

@@ -354,7 +354,7 @@ docker run --rm --name docker_registry_proxy -it
354354
### Why not use Docker's own registry, which has a mirror feature?
355355

356356
Yes, Docker offers [Registry as a pull through cache](https://docs.docker.com/registry/recipes/mirror/), *unfortunately*
357-
it only covers the DockerHub case. It won't cache images from `quay.io`, `k8s.gcr.io`, `gcr.io`, or any such, including any private registries.
357+
it only covers the DockerHub case. It won't cache images from `quay.io`, `registry.k8s.io`, `gcr.io`, or any such, including any private registries.
358358

359359
That means that your shiny new Kubernetes cluster is now a bandwidth hog, since every image will be pulled from the
360360
Internet on every Node it runs on, with no reuse.

Diff for: docs/compose/secrets.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# DockerHub authentication
2-
REGISTRIES="k8s.gcr.io gcr.io quay.io" # There is no need to specify auth.docker.io, it's built-in
2+
REGISTRIES="registry.k8s.io gcr.io quay.io" # There is no need to specify auth.docker.io, it's built-in
33
AUTH_REGISTRIES="auth.docker.io:your_dockerhub_username:your_dockerhub_password"

Diff for: docs/kops/docker-registry-proxy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- name: ENABLE_MANIFEST_CACHE
2626
value: "true"
2727
- name: REGISTRIES
28-
value: "k8s.gcr.io gcr.io quay.io us.gcr.io"
28+
value: "registry.k8s.io gcr.io quay.io us.gcr.io"
2929
ports:
3030
- name: http
3131
containerPort: 3128

0 commit comments

Comments
 (0)