From 86be784aa0c8e8014aac744630fcc1cf9178e1be Mon Sep 17 00:00:00 2001
From: James Blair <mail@jamesblair.net>
Date: Thu, 27 Oct 2022 17:09:33 -0400
Subject: [PATCH] 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>
---
 scripts/test-helpers                     | 2 +-
 tests/perf/tests/density/deployment.yaml | 2 +-
 tests/perf/tests/load/config.yaml        | 4 ++--
 tests/perf/tests/load/daemonset.yaml     | 2 +-
 tests/perf/tests/load/deployment.yaml    | 2 +-
 tests/perf/tests/load/job.yaml           | 2 +-
 tests/perf/tests/load/statefulset.yaml   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/test-helpers b/scripts/test-helpers
index 8d27cb727a..c001590a10 100755
--- a/scripts/test-helpers
+++ b/scripts/test-helpers
@@ -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
diff --git a/tests/perf/tests/density/deployment.yaml b/tests/perf/tests/density/deployment.yaml
index 1903dbaf89..bb47b41fc4 100644
--- a/tests/perf/tests/density/deployment.yaml
+++ b/tests/perf/tests/density/deployment.yaml
@@ -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:
diff --git a/tests/perf/tests/load/config.yaml b/tests/perf/tests/load/config.yaml
index a70765330a..89d4635d17 100644
--- a/tests/perf/tests/load/config.yaml
+++ b/tests/perf/tests/load/config.yaml
@@ -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:
diff --git a/tests/perf/tests/load/daemonset.yaml b/tests/perf/tests/load/daemonset.yaml
index 68acfefaec..6a3582ded9 100644
--- a/tests/perf/tests/load/daemonset.yaml
+++ b/tests/perf/tests/load/daemonset.yaml
@@ -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
diff --git a/tests/perf/tests/load/deployment.yaml b/tests/perf/tests/load/deployment.yaml
index 8a2f3a798b..233ab6b615 100644
--- a/tests/perf/tests/load/deployment.yaml
+++ b/tests/perf/tests/load/deployment.yaml
@@ -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:
diff --git a/tests/perf/tests/load/job.yaml b/tests/perf/tests/load/job.yaml
index f28e1b3ee2..15957d5a3f 100644
--- a/tests/perf/tests/load/job.yaml
+++ b/tests/perf/tests/load/job.yaml
@@ -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
diff --git a/tests/perf/tests/load/statefulset.yaml b/tests/perf/tests/load/statefulset.yaml
index 43157b7928..42924eb5eb 100644
--- a/tests/perf/tests/load/statefulset.yaml
+++ b/tests/perf/tests/load/statefulset.yaml
@@ -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