From 94b3ab833975557628ff305d908c6dd49cc9ddee Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Tue, 18 Jul 2023 09:55:09 -0300 Subject: [PATCH] versions: migrate out of k8s.gcr.io The k8s.gcr.io is deprecated for a while now and has been redirected to registry.k8s.io. However on some bare-metal machines in our testing pools that redirection is not working, so let's just replace the registries. Fixes #6461 Signed-off-by: Wainer dos Santos Moschetta Signed-off-by: Jeremi Piotrowski --- tests/integration/kubernetes/tests_common.sh | 2 +- tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml | 2 +- .../kata-deploy/examples/test-deploy-kata-dragonball.yaml | 2 +- tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml | 2 +- tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml | 2 +- tools/packaging/kata-deploy/examples/test-deploy-runc.yaml | 2 +- versions.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index 481cf4a57..660a429c8 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -11,7 +11,7 @@ # Variables used by the kubernetes tests export docker_images_nginx_version="1.15-alpine" -export container_images_agnhost_name="k8s.gcr.io/e2e-test-images/agnhost" +export container_images_agnhost_name="registry.k8s.io/e2e-test-images/agnhost" export container_images_agnhost_version="2.21" # Timeout options, mainly for use with waitForProcess(). Use them unless the diff --git a/tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml b/tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml index 665b03227..e942fa90d 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml @@ -16,7 +16,7 @@ spec: spec: runtimeClassName: kata-clh containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/tools/packaging/kata-deploy/examples/test-deploy-kata-dragonball.yaml b/tools/packaging/kata-deploy/examples/test-deploy-kata-dragonball.yaml index 14ad93a85..64ab68c52 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-kata-dragonball.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-kata-dragonball.yaml @@ -16,7 +16,7 @@ spec: spec: runtimeClassName: kata-dragonball containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml b/tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml index 498de27ae..0386bf2ad 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml @@ -16,7 +16,7 @@ spec: spec: runtimeClassName: kata-fc containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml b/tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml index 3abdbdd6e..75c9108c9 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml @@ -16,7 +16,7 @@ spec: spec: runtimeClassName: kata-qemu containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/tools/packaging/kata-deploy/examples/test-deploy-runc.yaml b/tools/packaging/kata-deploy/examples/test-deploy-runc.yaml index c7702bc0f..d347c0830 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-runc.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-runc.yaml @@ -15,7 +15,7 @@ spec: run: php-apache-runc spec: containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/versions.yaml b/versions.yaml index d610a5ca9..d4ee86bb3 100644 --- a/versions.yaml +++ b/versions.yaml @@ -260,7 +260,7 @@ externals: pause: description: "Kubernetes pause container image" - repo: "docker://k8s.gcr.io/pause" + repo: "docker://registry.k8s.io/pause" version: "3.6" runc: