github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move from k8s.gcr.io to registry.k8s.io

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas
2022-05-10 08:30:09 -04:00
parent aae07c6f7b
commit 50bea1dad8
232 changed files with 509 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/utils/image/csi_manifest.go
View File

@@ -27,7 +27,7 @@ import (
e2etestingmanifests "k8s.io/kubernetes/test/e2e/testing-manifests"
)
// All of the image tags are of the format k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3.
// All of the image tags are of the format registry.k8s.io/sig-storage/hostpathplugin:v1.7.3.
var imageRE = regexp.MustCompile(`^(.*)/([^/:]*):(.*)$`)
// appendCSIImageConfigs extracts image repo, name and version from

12
test/utils/image/manifest.go
View File

@@ -123,16 +123,16 @@ func readFromURL(url string, writer io.Writer) error {
var (
initRegistry = RegistryList{
GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling",
PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images",
BuildImageRegistry: "k8s.gcr.io/build-image",
PromoterE2eRegistry: "registry.k8s.io/e2e-test-images",
BuildImageRegistry: "registry.k8s.io/build-image",
InvalidRegistry: "invalid.registry.k8s.io/invalid",
GcEtcdRegistry: "k8s.gcr.io",
GcRegistry: "k8s.gcr.io",
SigStorageRegistry: "k8s.gcr.io/sig-storage",
GcEtcdRegistry: "registry.k8s.io",
GcRegistry: "registry.k8s.io",
SigStorageRegistry: "registry.k8s.io/sig-storage",
PrivateRegistry: "gcr.io/k8s-authenticated-test",
MicrosoftRegistry: "mcr.microsoft.com",
DockerLibraryRegistry: "docker.io/library",
CloudProviderGcpRegistry: "k8s.gcr.io/cloud-provider-gcp",
CloudProviderGcpRegistry: "registry.k8s.io/cloud-provider-gcp",
}
registry = initReg()

16
test/utils/image/manifest_test.go
View File

@@ -39,13 +39,13 @@ func BenchmarkReplaceRegistryInImageURL(b *testing.B) {
in: "test",
out: "test.io/library/test",
}, {
in: "k8s.gcr.io/test:123",
in: "registry.k8s.io/test:123",
out: "test.io/test:123",
}, {
in: "gcr.io/k8s-authenticated-test/test:123",
out: "test.io/k8s-authenticated-test/test:123",
}, {
in: "k8s.gcr.io/sig-storage/test:latest",
in: "registry.k8s.io/sig-storage/test:latest",
out: "test.io/sig-storage/test:latest",
}, {
in: "invalid.registry.k8s.io/invalid/test:latest",
@@ -54,10 +54,10 @@ func BenchmarkReplaceRegistryInImageURL(b *testing.B) {
in: "mcr.microsoft.com/test:latest",
out: "test.io/microsoft/test:latest",
}, {
in: "k8s.gcr.io/e2e-test-images/test:latest",
in: "registry.k8s.io/e2e-test-images/test:latest",
out: "test.io/promoter/test:latest",
}, {
in: "k8s.gcr.io/build-image/test:latest",
in: "registry.k8s.io/build-image/test:latest",
out: "test.io/build/test:latest",
}, {
in: "gcr.io/authenticated-image-pulling/test:latest",
@@ -100,13 +100,13 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
in: "test",
out: "test.io/library/test",
}, {
in: "k8s.gcr.io/test:123",
in: "registry.k8s.io/test:123",
out: "test.io/test:123",
}, {
in: "gcr.io/k8s-authenticated-test/test:123",
out: "test.io/k8s-authenticated-test/test:123",
}, {
in: "k8s.gcr.io/sig-storage/test:latest",
in: "registry.k8s.io/sig-storage/test:latest",
out: "test.io/sig-storage/test:latest",
}, {
in: "invalid.registry.k8s.io/invalid/test:latest",
@@ -115,10 +115,10 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
in: "mcr.microsoft.com/test:latest",
out: "test.io/microsoft/test:latest",
}, {
in: "k8s.gcr.io/e2e-test-images/test:latest",
in: "registry.k8s.io/e2e-test-images/test:latest",
out: "test.io/promoter/test:latest",
}, {
in: "k8s.gcr.io/build-image/test:latest",
in: "registry.k8s.io/build-image/test:latest",
out: "test.io/build/test:latest",
}, {
in: "gcr.io/authenticated-image-pulling/test:latest",

4
test/utils/runners.go
View File

@@ -1319,7 +1319,7 @@ func MakePodSpec() v1.PodSpec {
return v1.PodSpec{
Containers: []v1.Container{{
Name: "pause",
Image: "k8s.gcr.io/pause:3.7",
Image: "registry.k8s.io/pause:3.7",
Ports: []v1.ContainerPort{{ContainerPort: 80}},
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
@@ -1741,7 +1741,7 @@ type DaemonConfig struct {
func (config *DaemonConfig) Run() error {
if config.Image == "" {
config.Image = "k8s.gcr.io/pause:3.7"
config.Image = "registry.k8s.io/pause:3.7"
}
nameLabel := map[string]string{
"name": config.Name + "-daemon",