From 0db8fb8f9837a4393bdea21eb171b623f35ad227 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 #8098 Signed-off-by: Wainer dos Santos Moschetta (cherry picked from commit b2c3bca558c38deff2117d5909d9071c23c05590) --- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index f932bd656..fa3e77a15 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: