From 0f3b0b91732cfea78d03f05a380e870df18167a5 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 18 Jun 2024 11:37:12 +0200 Subject: [PATCH] [v0.59] replace k8s.gcr.io with registry.k8s.io We see issues in CI where we fail to pull from k8s.gcr.io. As k8s uses a new registry URL migrate to that[1] and hope it fixes the issues. [1] https://kubernetes.io/blog/2023/02/06/k8s-gcr-io-freeze-announcement/ Signed-off-by: Paul Holzinger Signed-off-by: tomsweeneyredhat --- libimage/manifests/manifests_test.go | 4 ++-- pkg/config/config_test.go | 2 +- pkg/config/testdata/containers_default.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libimage/manifests/manifests_test.go b/libimage/manifests/manifests_test.go index 859d7c6c7..c2a90a467 100644 --- a/libimage/manifests/manifests_test.go +++ b/libimage/manifests/manifests_test.go @@ -51,12 +51,12 @@ type listPtr = *list const ( listImageName = "foo" - otherListImage = "docker://k8s.gcr.io/pause:3.1" + otherListImage = "docker://registry.k8s.io/pause:3.1" otherListDigest = "sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea" otherListAmd64Digest = "sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610" otherListArm64Digest = "sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39" otherListPpc64Digest = "sha256:bcf9771c0b505e68c65440474179592ffdfa98790eb54ffbf129969c5e429990" - otherListInstanceDigest = "docker://k8s.gcr.io/pause@sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39" + otherListInstanceDigest = "docker://registry.k8s.io/pause@sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39" ) func TestSaveLoad(t *testing.T) { diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index bacab043d..6c6e722f4 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -334,7 +334,7 @@ image_copy_tmp_dir="storage"` gomega.Expect(defaultConfig.Engine.NetworkCmdOptions.Get()).To(gomega.BeEmpty()) gomega.Expect(defaultConfig.Engine.HelperBinariesDir.Get()).To(gomega.Equal(helperDirs)) gomega.Expect(defaultConfig.Engine.ServiceTimeout).To(gomega.BeEquivalentTo(300)) - gomega.Expect(defaultConfig.Engine.InfraImage).To(gomega.BeEquivalentTo("k8s.gcr.io/pause:3.4.1")) + gomega.Expect(defaultConfig.Engine.InfraImage).To(gomega.BeEquivalentTo("registry.k8s.io/pause:3.4.1")) gomega.Expect(defaultConfig.Engine.PodmanshTimeout).To(gomega.BeEquivalentTo(300)) gomega.Expect(defaultConfig.Machine.Volumes.Get()).To(gomega.BeEquivalentTo(volumes)) gomega.Expect(defaultConfig.Podmansh.Timeout).To(gomega.BeEquivalentTo(42)) diff --git a/pkg/config/testdata/containers_default.conf b/pkg/config/testdata/containers_default.conf index 83bbf132b..322319348 100644 --- a/pkg/config/testdata/containers_default.conf +++ b/pkg/config/testdata/containers_default.conf @@ -231,7 +231,7 @@ hooks_dir = [ # cdi_spec_dirs = [ "/etc/cdi" ] # Default infra (pause) image name for pod infra containers -infra_image = "k8s.gcr.io/pause:3.4.1" +infra_image = "registry.k8s.io/pause:3.4.1" # Default command to run the infra container infra_command = "/pause"