From bd32786b2051846d7550ae3c1f6a32c5d0fcd99f Mon Sep 17 00:00:00 2001
From: Carlos Panato <ctadeu@gmail.com>
Date: Fri, 12 Mar 2021 10:49:51 +0100
Subject: [PATCH] test: remove gcr.io/gke-release since it is deprecated

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

diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index a107ef6c276..40ee09336af 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -78,7 +78,6 @@ func initReg() RegistryList {
 		GcEtcdRegistry:          "k8s.gcr.io",
 		GcRegistry:              "k8s.gcr.io",
 		SigStorageRegistry:      "k8s.gcr.io/sig-storage",
-		GcrReleaseRegistry:      "gcr.io/gke-release",
 		PrivateRegistry:         "gcr.io/k8s-authenticated-test",
 		SampleRegistry:          "gcr.io/google-samples",
 		MicrosoftRegistry:       "mcr.microsoft.com",
@@ -116,7 +115,6 @@ var (
 	gcEtcdRegistry          = registry.GcEtcdRegistry
 	gcRegistry              = registry.GcRegistry
 	sigStorageRegistry      = registry.SigStorageRegistry
-	gcrReleaseRegistry      = registry.GcrReleaseRegistry
 	invalidRegistry         = registry.InvalidRegistry
 	sampleRegistry          = registry.SampleRegistry
 	microsoftRegistry       = registry.MicrosoftRegistry
@@ -397,8 +395,6 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
 		registryAndUser = PrivateRegistry
 	case "gcr.io/google-samples":
 		registryAndUser = sampleRegistry
-	case "gcr.io/gke-release":
-		registryAndUser = gcrReleaseRegistry
 	case "docker.io/library":
 		registryAndUser = dockerLibraryRegistry
 	default:
diff --git a/test/utils/image/manifest_test.go b/test/utils/image/manifest_test.go
index 7f7e444de1b..b472304dfdd 100644
--- a/test/utils/image/manifest_test.go
+++ b/test/utils/image/manifest_test.go
@@ -82,13 +82,6 @@ var registryTests = []struct {
 			err:    nil,
 		},
 	},
-	{
-		"gcr.io/gke-release/test:latest",
-		result{
-			result: "test.io/gke-release/test:latest",
-			err:    nil,
-		},
-	},
 	{
 		"gcr.io/google-samples/test:latest",
 		result{
@@ -119,7 +112,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
 	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"
 	sampleRegistry = "test.io/google-samples"
 	sigStorageRegistry = "test.io/sig-storage"