From e9870c30769f2918a266262961062903d05d7df1 Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Tue, 10 Dec 2019 11:56:34 -0500
Subject: [PATCH] Update storage hash to use ingress type for cross-group
 comparison

---
 pkg/master/master_test.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go
index 4b144946187..57deba941c0 100644
--- a/pkg/master/master_test.go
+++ b/pkg/master/master_test.go
@@ -426,32 +426,32 @@ func TestStorageVersionHashEqualities(t *testing.T) {
 
 	server := httptest.NewServer(master.GenericAPIServer.Handler.GoRestfulContainer.ServeMux)
 
-	// Test 1: extensions/v1beta1/replicasets and apps/v1/replicasets have
+	// Test 1: extensions/v1beta1/ingresses and apps/v1/ingresses have
 	// the same storage version hash.
 	resp, err := http.Get(server.URL + "/apis/extensions/v1beta1")
 	assert.Empty(err)
 	extList := metav1.APIResourceList{}
 	assert.NoError(decodeResponse(resp, &extList))
-	var extReplicasetHash, appsReplicasetHash string
+	var extIngressHash, appsIngressHash string
 	for _, r := range extList.APIResources {
-		if r.Name == "replicasets" {
-			extReplicasetHash = r.StorageVersionHash
-			assert.NotEmpty(extReplicasetHash)
+		if r.Name == "ingresses" {
+			extIngressHash = r.StorageVersionHash
+			assert.NotEmpty(extIngressHash)
 		}
 	}
 
-	resp, err = http.Get(server.URL + "/apis/apps/v1")
+	resp, err = http.Get(server.URL + "/apis/networking.k8s.io/v1beta1")
 	assert.Empty(err)
 	appsList := metav1.APIResourceList{}
 	assert.NoError(decodeResponse(resp, &appsList))
 	for _, r := range appsList.APIResources {
-		if r.Name == "replicasets" {
-			appsReplicasetHash = r.StorageVersionHash
-			assert.NotEmpty(appsReplicasetHash)
+		if r.Name == "ingresses" {
+			appsIngressHash = r.StorageVersionHash
+			assert.NotEmpty(appsIngressHash)
 		}
 	}
-	if len(extReplicasetHash) > 0 && len(appsReplicasetHash) > 0 {
-		assert.Equal(extReplicasetHash, appsReplicasetHash)
+	if len(extIngressHash) > 0 && len(appsIngressHash) > 0 {
+		assert.Equal(extIngressHash, appsIngressHash)
 	}
 
 	// Test 2: batch/v1/jobs and batch/v1beta1/cronjobs have different