Commit 0b19c2b7 authored by James Blair's avatar James Blair Committed by Brad Davidson

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: 's avatarJames Blair <mail@jamesblair.net> Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 71abdec6
...@@ -456,7 +456,7 @@ provision-registry-proxy() { ...@@ -456,7 +456,7 @@ provision-registry-proxy() {
set -e -o pipefail set -e -o pipefail
local image="docker.io/library/registry:2.8.1" local image="docker.io/library/registry:2.8.1"
local prefix="docker-registry-" 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" local registries_yaml="$TEST_DIR/registries.yaml"
echo "mirrors:" > $registries_yaml echo "mirrors:" > $registries_yaml
......
...@@ -16,7 +16,7 @@ spec: ...@@ -16,7 +16,7 @@ spec:
group: {{.Group}} group: {{.Group}}
spec: spec:
containers: containers:
- image: k8s.gcr.io/pause:3.1 - image: registry.k8s.io/pause:3.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: {{.Name}} name: {{.Name}}
ports: ports:
......
...@@ -199,7 +199,7 @@ steps: ...@@ -199,7 +199,7 @@ steps:
- basename: daemonset - basename: daemonset
objectTemplatePath: daemonset.yaml objectTemplatePath: daemonset.yaml
templateFillMap: templateFillMap:
Image: k8s.gcr.io/pause:3.0 Image: registry.k8s.io/pause:3.0
{{end}} {{end}}
- namespaceRange: - namespaceRange:
min: 1 min: 1
...@@ -434,7 +434,7 @@ steps: ...@@ -434,7 +434,7 @@ steps:
- basename: daemonset - basename: daemonset
objectTemplatePath: daemonset.yaml objectTemplatePath: daemonset.yaml
templateFillMap: templateFillMap:
Image: k8s.gcr.io/pause:3.1 Image: registry.k8s.io/pause:3.1
{{end}} {{end}}
{{if $ENABLE_JOBS}} {{if $ENABLE_JOBS}}
- namespaceRange: - namespaceRange:
......
{{$Image := DefaultParam .Image "k8s.gcr.io/pause:3.1"}} {{$Image := DefaultParam .Image "registry.k8s.io/pause:3.1"}}
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
......
...@@ -21,7 +21,7 @@ spec: ...@@ -21,7 +21,7 @@ spec:
svc: {{.SvcName}}-{{.Index}} svc: {{.SvcName}}-{{.Index}}
spec: spec:
containers: containers:
- image: k8s.gcr.io/pause:3.1 - image: registry.k8s.io/pause:3.1
name: {{.Name}} name: {{.Name}}
resources: resources:
requests: requests:
......
...@@ -19,7 +19,7 @@ spec: ...@@ -19,7 +19,7 @@ spec:
containers: containers:
- name: {{.Name}} - name: {{.Name}}
# TODO(#799): We should test the "run-to-completion" workflow and hence don't use pause pods. # 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: resources:
requests: requests:
cpu: 10m cpu: 10m
......
...@@ -22,7 +22,7 @@ spec: ...@@ -22,7 +22,7 @@ spec:
spec: spec:
containers: containers:
- name: {{.Name}} - name: {{.Name}}
image: k8s.gcr.io/pause:3.1 image: registry.k8s.io/pause:3.1
ports: ports:
- containerPort: 80 - containerPort: 80
name: web name: web
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment