github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-24 13:52:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2360 from mtrmac/k8s.gcr.io-6

Browse Source 
[release-1.6] Refer to registry.k8s.io instead of k8s.gcr.io
This commit is contained in:
Colin Walters 2024-06-19 19:41:30 -04:00 committed by GitHub
commit 378e64f554
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/copy_test.go
View File

@ -543,7 +543,7 @@ func (s *CopySuite) TestCopySimple(c *check.C) {
// FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection. // FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection.
// "pull": docker: → dir: // "pull": docker: → dir:
assertSkopeoSucceeds(c, "", "copy", "docker://k8s.gcr.io/pause", "dir:"+dir1) assertSkopeoSucceeds(c, "", "copy", "docker://registry.k8s.io/pause", "dir:"+dir1)
// "push": dir: → docker(v2s2): // "push": dir: → docker(v2s2):
assertSkopeoSucceeds(c, "", "--tls-verify=false", "--debug", "copy", "dir:"+dir1, ourRegistry+"pause:unsigned") assertSkopeoSucceeds(c, "", "--tls-verify=false", "--debug", "copy", "dir:"+dir1, ourRegistry+"pause:unsigned")
// The result of pushing and pulling is an unmodified image. // The result of pushing and pulling is an unmodified image.
@ -557,14 +557,14 @@ func (s *CopySuite) TestCopySimple(c *check.C) {
ociDest := "pause-latest-image" ociDest := "pause-latest-image"
ociImgName := "pause" ociImgName := "pause"
defer os.RemoveAll(ociDest) defer os.RemoveAll(ociDest)
assertSkopeoSucceeds(c, "", "copy", "docker://k8s.gcr.io/pause:latest", "oci:"+ociDest+":"+ociImgName) assertSkopeoSucceeds(c, "", "copy", "docker://registry.k8s.io/pause:latest", "oci:"+ociDest+":"+ociImgName)
_, err = os.Stat(ociDest) _, err = os.Stat(ociDest)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
// docker v2s2 -> OCI image layout without image name // docker v2s2 -> OCI image layout without image name
ociDest = "pause-latest-noimage" ociDest = "pause-latest-noimage"
defer os.RemoveAll(ociDest) defer os.RemoveAll(ociDest)
assertSkopeoSucceeds(c, "", "copy", "docker://k8s.gcr.io/pause:latest", "oci:"+ociDest) assertSkopeoSucceeds(c, "", "copy", "docker://registry.k8s.io/pause:latest", "oci:"+ociDest)
_, err = os.Stat(ociDest) _, err = os.Stat(ociDest)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
} }

12
integration/sync_test.go
View File

@ -24,13 +24,13 @@ const (
// manifest lists, and with some tags that don't. // manifest lists, and with some tags that don't.
pullableRepo = "quay.io/libpod/testimage" pullableRepo = "quay.io/libpod/testimage"
// A tagged image in the repository that we can inspect and copy. // A tagged image in the repository that we can inspect and copy.
pullableTaggedImage = "k8s.gcr.io/coredns/coredns:v1.6.6" pullableTaggedImage = "registry.k8s.io/coredns/coredns:v1.6.6"
// A tagged manifest list in the repository that we can inspect and copy. // A tagged manifest list in the repository that we can inspect and copy.
pullableTaggedManifestList = "k8s.gcr.io/coredns/coredns:v1.8.0" pullableTaggedManifestList = "registry.k8s.io/coredns/coredns:v1.8.0"
// A repository containing multiple tags, some of which are for // A repository containing multiple tags, some of which are for
// manifest lists, and which includes a "latest" tag. We specify the // manifest lists, and which includes a "latest" tag. We specify the
// name here without a tag. // name here without a tag.
pullableRepoWithLatestTag = "k8s.gcr.io/pause" pullableRepoWithLatestTag = "registry.k8s.io/pause"
) )
func init() { func init() {
@ -325,7 +325,7 @@ func (s *SyncSuite) TestYamlRegex2Dir(c *check.C) {
dir1 := path.Join(tmpDir, "dir1") dir1 := path.Join(tmpDir, "dir1")
yamlConfig := ` yamlConfig := `
k8s.gcr.io: registry.k8s.io:
images-by-tag-regex: images-by-tag-regex:
pause: ^[12]\.0$ # regex string test pause: ^[12]\.0$ # regex string test
` `
@ -359,7 +359,7 @@ func (s *SyncSuite) TestYamlDigest2Dir(c *check.C) {
dir1 := path.Join(tmpDir, "dir1") dir1 := path.Join(tmpDir, "dir1")
yamlConfig := ` yamlConfig := `
k8s.gcr.io: registry.k8s.io:
images: images:
pause: pause:
- sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610 - sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610
@ -390,7 +390,7 @@ func (s *SyncSuite) TestYaml2Dir(c *check.C) {
dir1 := path.Join(tmpDir, "dir1") dir1 := path.Join(tmpDir, "dir1")
yamlConfig := ` yamlConfig := `
k8s.gcr.io: registry.k8s.io:
images: images:
coredns/coredns: coredns/coredns:
- v1.8.0 - v1.8.0