opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18145 from sohankunkerkar/registry-migration

Browse Source 
*: migrate image registry to registry.k8s.io
This commit is contained in:
OpenShift Merge Robot
2023-04-12 06:37:28 -04:00
committed by GitHub
parent af74ac693a 64ea5971a1
commit 8a9386d898
7 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/source/markdown/podman-events.1.md
View File

@ -174,7 +174,7 @@ Show only Podman create events
``` ```
$ podman events -f event=create $ podman events -f event=create
2019-03-02 10:36:01.375685062 -0600 CST container create 20dc581f6fbf (image=docker.io/library/alpine:latest, name=sharp_morse) 2019-03-02 10:36:01.375685062 -0600 CST container create 20dc581f6fbf (image=docker.io/library/alpine:latest, name=sharp_morse)
2019-03-02 10:36:08.561188337 -0600 CST container create 58e7e002344c (image=k8s.gcr.io/pause:3.1, name=3e701f270d54-infra) 2019-03-02 10:36:08.561188337 -0600 CST container create 58e7e002344c (image=registry.k8s.io/pause:3.1, name=3e701f270d54-infra)
2019-03-02 10:36:13.146899437 -0600 CST volume create cad6dc50e087 (image=, name=cad6dc50e0879568e7d656bd004bd343d6035e7fc4024e1711506fe2fd459e6f) 2019-03-02 10:36:13.146899437 -0600 CST volume create cad6dc50e087 (image=, name=cad6dc50e0879568e7d656bd004bd343d6035e7fc4024e1711506fe2fd459e6f)
2019-03-02 10:36:29.978806894 -0600 CST container create d81e30f1310f (image=docker.io/library/busybox:latest, name=musing_newton) 2019-03-02 10:36:29.978806894 -0600 CST container create d81e30f1310f (image=docker.io/library/busybox:latest, name=musing_newton)
``` ```
@ -190,9 +190,9 @@ $ podman events --filter event=create --filter type=pod
Show only Podman events created in the last five minutes: Show only Podman events created in the last five minutes:
``` ```
$ sudo podman events --since 5m $ sudo podman events --since 5m
2019-03-02 10:44:29.598835409 -0600 CST container create b629d10d3831 (image=k8s.gcr.io/pause:3.1, name=1df5ebca7b44-infra) 2019-03-02 10:44:29.598835409 -0600 CST container create b629d10d3831 (image=registry.k8s.io/pause:3.1, name=1df5ebca7b44-infra)
2019-03-02 10:44:29.601746633 -0600 CST pod create 1df5ebca7b44 (image=, name=confident_hawking) 2019-03-02 10:44:29.601746633 -0600 CST pod create 1df5ebca7b44 (image=, name=confident_hawking)
2019-03-02 10:44:42.371100253 -0600 CST container create 170a0f457d00 (image=k8s.gcr.io/pause:3.1, name=ca731231718e-infra) 2019-03-02 10:44:42.371100253 -0600 CST container create 170a0f457d00 (image=registry.k8s.io/pause:3.1, name=ca731231718e-infra)
2019-03-02 10:44:42.374637304 -0600 CST pod create ca731231718e (image=, name=webapp) 2019-03-02 10:44:42.374637304 -0600 CST pod create ca731231718e (image=, name=webapp)
``` ```

2
pkg/k8s.io/api/core/v1/types.go
View File

@ -3424,7 +3424,7 @@ type ConfigMapNodeConfigSource struct {
// Describe a container image // Describe a container image
type ContainerImage struct { type ContainerImage struct {
// Names by which this image is known. // Names by which this image is known.
// e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] // e.g. ["registry.k8s.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]
// +optional // +optional
Names []string `json:"names"` Names []string `json:"names"`
// The size of the image in bytes. // The size of the image in bytes.

2
test/e2e/config.go
View File

@ -10,7 +10,7 @@ var (
ALPINEAMD64ID = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4" ALPINEAMD64ID = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4"
ALPINEARM64DIGEST = "quay.io/libpod/alpine@sha256:f270dcd11e64b85919c3bab66886e59d677cf657528ac0e4805d3c71e458e525" ALPINEARM64DIGEST = "quay.io/libpod/alpine@sha256:f270dcd11e64b85919c3bab66886e59d677cf657528ac0e4805d3c71e458e525"
ALPINEARM64ID = "915beeae46751fc564998c79e73a1026542e945ca4f73dc841d09ccc6c2c0672" ALPINEARM64ID = "915beeae46751fc564998c79e73a1026542e945ca4f73dc841d09ccc6c2c0672"
INFRA_IMAGE = "k8s.gcr.io/pause:3.2" //nolint:revive,stylecheck INFRA_IMAGE = "registry.k8s.io/pause:3.2" //nolint:revive,stylecheck
BB = "quay.io/libpod/busybox:latest" BB = "quay.io/libpod/busybox:latest"
HEALTHCHECK_IMAGE = "quay.io/libpod/alpine_healthcheck:latest" //nolint:revive,stylecheck HEALTHCHECK_IMAGE = "quay.io/libpod/alpine_healthcheck:latest" //nolint:revive,stylecheck
fedoraToolbox = "registry.fedoraproject.org/fedora-toolbox:36" fedoraToolbox = "registry.fedoraproject.org/fedora-toolbox:36"

4
test/e2e/manifest_test.go
View File

@ -23,8 +23,8 @@ var _ = Describe("Podman manifest", func() {
) )
const ( const (
imageList = "docker://k8s.gcr.io/pause:3.1" imageList = "docker://registry.k8s.io/pause:3.1"
imageListInstance = "docker://k8s.gcr.io/pause@sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39" imageListInstance = "docker://registry.k8s.io/pause@sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39"
imageListARM64InstanceDigest = "sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39" imageListARM64InstanceDigest = "sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39"
imageListAMD64InstanceDigest = "sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610" imageListAMD64InstanceDigest = "sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610"
imageListARMInstanceDigest = "sha256:c84b0a3a07b628bc4d62e5047d0f8dff80f7c00979e1e28a821a033ecda8fe53" imageListARMInstanceDigest = "sha256:c84b0a3a07b628bc4d62e5047d0f8dff80f7c00979e1e28a821a033ecda8fe53"

2
test/e2e/play_kube_test.go
View File

@ -1961,7 +1961,7 @@ var _ = Describe("Podman play kube", func() {
It("podman play kube should use customized infra_image", func() { It("podman play kube should use customized infra_image", func() {
conffile := filepath.Join(podmanTest.TempDir, "container.conf") conffile := filepath.Join(podmanTest.TempDir, "container.conf")
infraImage := "k8s.gcr.io/pause:3.2" infraImage := "registry.k8s.io/pause:3.2"
err := os.WriteFile(conffile, []byte(fmt.Sprintf("[engine]\ninfra_image=\"%s\"\n", infraImage)), 0644) err := os.WriteFile(conffile, []byte(fmt.Sprintf("[engine]\ninfra_image=\"%s\"\n", infraImage)), 0644)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())

2
test/system/200-pod.bats
View File

@ -325,7 +325,7 @@ EOF
@test "podman pod create should fail when infra-name is already in use" { @test "podman pod create should fail when infra-name is already in use" {
local infra_name="infra_container_$(random_string 10 | tr A-Z a-z)" local infra_name="infra_container_$(random_string 10 | tr A-Z a-z)"
local infra_image="k8s.gcr.io/pause:3.5" local infra_image="registry.k8s.io/pause:3.5"
local pod_name="$(random_string 10 | tr A-Z a-z)" local pod_name="$(random_string 10 | tr A-Z a-z)"
run_podman --noout pod create --name $pod_name --infra-name "$infra_name" --infra-image "$infra_image" run_podman --noout pod create --name $pod_name --infra-name "$infra_name" --infra-image "$infra_image"

1
test/system/700-play.bats
View File

@ -80,6 +80,7 @@ RELABEL="system_u:object_r:container_file_t:s0"
# Make sure that the K8s pause image isn't pulled but the local podman-pause is built. # Make sure that the K8s pause image isn't pulled but the local podman-pause is built.
run_podman images run_podman images
run_podman 1 image exists k8s.gcr.io/pause run_podman 1 image exists k8s.gcr.io/pause
run_podman 1 image exists registry.k8s.io/pause
run_podman image exists $(pause_image) run_podman image exists $(pause_image)
run_podman stop -a -t 0 run_podman stop -a -t 0