Merge pull request #103724 from claudiubelu/update-e2e-test-images-url

Update e2e test images url

test/utils/image/manifest.go

@@ -31,7 +31,6 @@ import (
 // RegistryList holds public and private image registries
 type RegistryList struct {
 	GcAuthenticatedRegistry  string `yaml:"gcAuthenticatedRegistry"`
-	E2eRegistry              string `yaml:"e2eRegistry"`
 	PromoterE2eRegistry      string `yaml:"promoterE2eRegistry"`
 	BuildImageRegistry       string `yaml:"buildImageRegistry"`
 	InvalidRegistry          string `yaml:"invalidRegistry"`
@@ -89,7 +88,6 @@ func initReg() RegistryList {
 var (
 	initRegistry = RegistryList{
 		GcAuthenticatedRegistry:  "gcr.io/authenticated-image-pulling",
-		E2eRegistry:              "gcr.io/kubernetes-e2e-test-images",
 		PromoterE2eRegistry:      "k8s.gcr.io/e2e-test-images",
 		BuildImageRegistry:       "k8s.gcr.io/build-image",
 		InvalidRegistry:          "invalid.com/invalid",
@@ -379,8 +377,6 @@ func replaceRegistryInImageURLWithList(imageURL string, reg RegistryList) (strin
 	}
 
 	switch registryAndUser {
-	case initRegistry.E2eRegistry:
-		registryAndUser = reg.E2eRegistry
 	case initRegistry.GcRegistry:
 		registryAndUser = reg.GcRegistry
 	case initRegistry.SigStorageRegistry:

test/utils/image/manifest_test.go

@@ -40,9 +40,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
 		}, {
 			in:  "test",
 			out: "test.io/library/test",
-		}, {
-			in:  "gcr.io/kubernetes-e2e-test-images/test:123",
-			out: "test.io/kubernetes-e2e-test-images/test:123",
 		}, {
 			in:  "k8s.gcr.io/test:123",
 			out: "test.io/test:123",
@@ -76,7 +73,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
 	// Set custom registries
 	reg := RegistryList{
 		DockerLibraryRegistry:   "test.io/library",
-		E2eRegistry:             "test.io/kubernetes-e2e-test-images",
 		GcRegistry:              "test.io",
 		PrivateRegistry:         "test.io/k8s-authenticated-test",
 		SigStorageRegistry:      "test.io/sig-storage",