From 927d0c39322725112cf1f53d6f2cb7e1e09f71d5 Mon Sep 17 00:00:00 2001
From: Claudiu Belu <cbelu@cloudbasesolutions.com>
Date: Sun, 4 Jul 2021 08:31:14 -0700
Subject: [PATCH] cleanup: Removes GcrRelease and SampleRegistry from
 manifest.go

Those fields are not used for any images, we can remove them.
---
 test/utils/image/manifest.go      | 8 --------
 test/utils/image/manifest_test.go | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index 72db6da0c63..577aefb76b6 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -38,9 +38,7 @@ type RegistryList struct {
 	GcEtcdRegistry           string `yaml:"gcEtcdRegistry"`
 	GcRegistry               string `yaml:"gcRegistry"`
 	SigStorageRegistry       string `yaml:"sigStorageRegistry"`
-	GcrReleaseRegistry       string `yaml:"gcrReleaseRegistry"`
 	PrivateRegistry          string `yaml:"privateRegistry"`
-	SampleRegistry           string `yaml:"sampleRegistry"`
 	MicrosoftRegistry        string `yaml:"microsoftRegistry"`
 	DockerLibraryRegistry    string `yaml:"dockerLibraryRegistry"`
 	CloudProviderGcpRegistry string `yaml:"cloudProviderGcpRegistry"`
@@ -99,8 +97,6 @@ var (
 		GcRegistry:               "k8s.gcr.io",
 		SigStorageRegistry:       "k8s.gcr.io/sig-storage",
 		PrivateRegistry:          "gcr.io/k8s-authenticated-test",
-		SampleRegistry:           "gcr.io/google-samples",
-		GcrReleaseRegistry:       "gcr.io/gke-release",
 		MicrosoftRegistry:        "mcr.microsoft.com",
 		DockerLibraryRegistry:    "docker.io/library",
 		CloudProviderGcpRegistry: "k8s.gcr.io/cloud-provider-gcp",
@@ -391,10 +387,6 @@ func replaceRegistryInImageURLWithList(imageURL string, reg RegistryList) (strin
 		registryAndUser = reg.SigStorageRegistry
 	case initRegistry.PrivateRegistry:
 		registryAndUser = reg.PrivateRegistry
-	case initRegistry.SampleRegistry:
-		registryAndUser = reg.SampleRegistry
-	case initRegistry.GcrReleaseRegistry:
-		registryAndUser = reg.GcrReleaseRegistry
 	case initRegistry.InvalidRegistry:
 		registryAndUser = reg.InvalidRegistry
 	case initRegistry.MicrosoftRegistry:
diff --git a/test/utils/image/manifest_test.go b/test/utils/image/manifest_test.go
index 82bf9db92fa..ce9ffc4d79c 100644
--- a/test/utils/image/manifest_test.go
+++ b/test/utils/image/manifest_test.go
@@ -49,12 +49,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
 		}, {
 			in:  "gcr.io/k8s-authenticated-test/test:123",
 			out: "test.io/k8s-authenticated-test/test:123",
-		}, {
-			in:  "gcr.io/google-samples/test:latest",
-			out: "test.io/google-samples/test:latest",
-		}, {
-			in:  "gcr.io/gke-release/test:latest",
-			out: "test.io/gke-release/test:latest",
 		}, {
 			in:  "k8s.gcr.io/sig-storage/test:latest",
 			out: "test.io/sig-storage/test:latest",
@@ -84,9 +78,7 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
 		DockerLibraryRegistry:   "test.io/library",
 		E2eRegistry:             "test.io/kubernetes-e2e-test-images",
 		GcRegistry:              "test.io",
-		GcrReleaseRegistry:      "test.io/gke-release",
 		PrivateRegistry:         "test.io/k8s-authenticated-test",
-		SampleRegistry:          "test.io/google-samples",
 		SigStorageRegistry:      "test.io/sig-storage",
 		InvalidRegistry:         "test.io/invalid",
 		MicrosoftRegistry:       "test.io/microsoft",