Replace deprecated k8s registry references.

Problem:
Previously all of Kubernetes' image hosting has been out of gcr.io. There were significant egress costs associated with this when images were pulled from entities outside gcp.  Refer to https://github.com/kubernetes/k8s.io/wiki/New-Registry-url-for-Kubernetes-(registry.k8s.io)

Solution:
As highlighted at KubeCon NA 2022 k8s infra SIG update, the replacement for k8s.gcr.io which is registry.k8s.io is now ready for mainstream use and the old k8s.gcr.io has been formally deprecated. This commit migrates all references for k3s to registry.k8s.io.

Signed-off-by: James Blair <mail@jamesblair.net>
This commit is contained in:
James Blair 2022-10-27 17:09:33 -04:00 committed by Brad Davidson
parent cb86d2c1f0
commit 86be784aa0
7 changed files with 8 additions and 8 deletions

View File

@ -456,7 +456,7 @@ provision-registry-proxy() {
set -e -o pipefail
local image="docker.io/library/registry:2.8.1"
local prefix="docker-registry-"
local registries="docker.io:registry-1.docker.io k8s.gcr.io gcr.io quay.io ghcr.io"
local registries="docker.io:registry-1.docker.io registry.k8s.io gcr.io quay.io ghcr.io"
local registries_yaml="$TEST_DIR/registries.yaml"
echo "mirrors:" > $registries_yaml

View File

@ -16,7 +16,7 @@ spec:
group: {{.Group}}
spec:
containers:
- image: k8s.gcr.io/pause:3.1
- image: registry.k8s.io/pause:3.1
imagePullPolicy: IfNotPresent
name: {{.Name}}
ports:

View File

@ -199,7 +199,7 @@ steps:
- basename: daemonset
objectTemplatePath: daemonset.yaml
templateFillMap:
Image: k8s.gcr.io/pause:3.0
Image: registry.k8s.io/pause:3.0
{{end}}
- namespaceRange:
min: 1
@ -434,7 +434,7 @@ steps:
- basename: daemonset
objectTemplatePath: daemonset.yaml
templateFillMap:
Image: k8s.gcr.io/pause:3.1
Image: registry.k8s.io/pause:3.1
{{end}}
{{if $ENABLE_JOBS}}
- namespaceRange:

View File

@ -1,4 +1,4 @@
{{$Image := DefaultParam .Image "k8s.gcr.io/pause:3.1"}}
{{$Image := DefaultParam .Image "registry.k8s.io/pause:3.1"}}
apiVersion: apps/v1
kind: DaemonSet

View File

@ -21,7 +21,7 @@ spec:
svc: {{.SvcName}}-{{.Index}}
spec:
containers:
- image: k8s.gcr.io/pause:3.1
- image: registry.k8s.io/pause:3.1
name: {{.Name}}
resources:
requests:

View File

@ -19,7 +19,7 @@ spec:
containers:
- name: {{.Name}}
# TODO(#799): We should test the "run-to-completion" workflow and hence don't use pause pods.
image: k8s.gcr.io/pause:3.1
image: registry.k8s.io/pause:3.1
resources:
requests:
cpu: 10m

View File

@ -22,7 +22,7 @@ spec:
spec:
containers:
- name: {{.Name}}
image: k8s.gcr.io/pause:3.1
image: registry.k8s.io/pause:3.1
ports:
- containerPort: 80
name: web