Skip to content

Commit 0f3b0b9

Browse files
Luap99TomSweeneyRedHat
authored andcommitted
[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 <[email protected]> Signed-off-by: tomsweeneyredhat <[email protected]>
1 parent 0705c8e commit 0f3b0b9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: libimage/manifests/manifests_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ type listPtr = *list
5151
const (
5252
listImageName = "foo"
5353

54-
otherListImage = "docker://k8s.gcr.io/pause:3.1"
54+
otherListImage = "docker://registry.k8s.io/pause:3.1"
5555
otherListDigest = "sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea"
5656
otherListAmd64Digest = "sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610"
5757
otherListArm64Digest = "sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39"
5858
otherListPpc64Digest = "sha256:bcf9771c0b505e68c65440474179592ffdfa98790eb54ffbf129969c5e429990"
59-
otherListInstanceDigest = "docker://k8s.gcr.io/pause@sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39"
59+
otherListInstanceDigest = "docker://registry.k8s.io/pause@sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39"
6060
)
6161

6262
func TestSaveLoad(t *testing.T) {

Diff for: pkg/config/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ image_copy_tmp_dir="storage"`
334334
gomega.Expect(defaultConfig.Engine.NetworkCmdOptions.Get()).To(gomega.BeEmpty())
335335
gomega.Expect(defaultConfig.Engine.HelperBinariesDir.Get()).To(gomega.Equal(helperDirs))
336336
gomega.Expect(defaultConfig.Engine.ServiceTimeout).To(gomega.BeEquivalentTo(300))
337-
gomega.Expect(defaultConfig.Engine.InfraImage).To(gomega.BeEquivalentTo("k8s.gcr.io/pause:3.4.1"))
337+
gomega.Expect(defaultConfig.Engine.InfraImage).To(gomega.BeEquivalentTo("registry.k8s.io/pause:3.4.1"))
338338
gomega.Expect(defaultConfig.Engine.PodmanshTimeout).To(gomega.BeEquivalentTo(300))
339339
gomega.Expect(defaultConfig.Machine.Volumes.Get()).To(gomega.BeEquivalentTo(volumes))
340340
gomega.Expect(defaultConfig.Podmansh.Timeout).To(gomega.BeEquivalentTo(42))

Diff for: pkg/config/testdata/containers_default.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ hooks_dir = [
231231
# cdi_spec_dirs = [ "/etc/cdi" ]
232232

233233
# Default infra (pause) image name for pod infra containers
234-
infra_image = "k8s.gcr.io/pause:3.4.1"
234+
infra_image = "registry.k8s.io/pause:3.4.1"
235235

236236
# Default command to run the infra container
237237
infra_command = "/pause"

0 commit comments

Comments
 (0)