From 59d96263e4c9ca0672c4e55776713461ee1bcca7 Mon Sep 17 00:00:00 2001
From: pacoxu <paco.xu@daocloud.io>
Date: Thu, 11 Mar 2021 15:54:33 +0800
Subject: [PATCH] remove e2e volume registry as it is not used

---
 test/utils/image/manifest.go      | 5 -----
 test/utils/image/manifest_test.go | 8 --------
 2 files changed, 13 deletions(-)

diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index c29489475ad..b94dd25b4c8 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -32,7 +32,6 @@ import (
 type RegistryList struct {
 	GcAuthenticatedRegistry string `yaml:"gcAuthenticatedRegistry"`
 	E2eRegistry             string `yaml:"e2eRegistry"`
-	E2eVolumeRegistry       string `yaml:"e2eVolumeRegistry"`
 	PromoterE2eRegistry     string `yaml:"promoterE2eRegistry"`
 	BuildImageRegistry      string `yaml:"buildImageRegistry"`
 	InvalidRegistry         string `yaml:"invalidRegistry"`
@@ -71,7 +70,6 @@ func initReg() RegistryList {
 	registry := RegistryList{
 		GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling",
 		E2eRegistry:             "gcr.io/kubernetes-e2e-test-images",
-		E2eVolumeRegistry:       "gcr.io/kubernetes-e2e-test-images/volume",
 		PromoterE2eRegistry:     "k8s.gcr.io/e2e-test-images",
 		BuildImageRegistry:      "k8s.gcr.io/build-image",
 		InvalidRegistry:         "invalid.com/invalid",
@@ -109,7 +107,6 @@ var (
 	// Preconfigured image configs
 	dockerLibraryRegistry   = "docker.io/library"
 	e2eRegistry             = registry.E2eRegistry
-	e2eVolumeRegistry       = registry.E2eVolumeRegistry
 	promoterE2eRegistry     = registry.PromoterE2eRegistry
 	buildImageRegistry      = registry.BuildImageRegistry
 	gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry
@@ -387,8 +384,6 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
 	switch registryAndUser {
 	case "gcr.io/kubernetes-e2e-test-images":
 		registryAndUser = e2eRegistry
-	case "gcr.io/kubernetes-e2e-test-images/volume":
-		registryAndUser = e2eVolumeRegistry
 	case "k8s.gcr.io":
 		registryAndUser = gcRegistry
 	case "k8s.gcr.io/sig-storage":
diff --git a/test/utils/image/manifest_test.go b/test/utils/image/manifest_test.go
index 7f7e444de1b..2cd10f1ac6d 100644
--- a/test/utils/image/manifest_test.go
+++ b/test/utils/image/manifest_test.go
@@ -61,13 +61,6 @@ var registryTests = []struct {
 			err:    nil,
 		},
 	},
-	{
-		"gcr.io/kubernetes-e2e-test-images/volume/test:123",
-		result{
-			result: "test.io/kubernetes-e2e-test-images/volume/test:123",
-			err:    nil,
-		},
-	},
 	{
 		"k8s.gcr.io/test:123",
 		result{
@@ -117,7 +110,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
 	// Set custom registries
 	dockerLibraryRegistry = "test.io/library"
 	e2eRegistry = "test.io/kubernetes-e2e-test-images"
-	e2eVolumeRegistry = "test.io/kubernetes-e2e-test-images/volume"
 	gcRegistry = "test.io"
 	gcrReleaseRegistry = "test.io/gke-release"
 	PrivateRegistry = "test.io/k8s-authenticated-test"