github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert k8s.gcr.io vanity domain

Browse Source 
This reverts commit eba5b6092a.

Fixes https://github.com/kubernetes/kubernetes/issues/57526
This commit is contained in:
Tim Hockin
2017-12-22 14:36:16 -08:00
parent 475d5c32e8
commit e9dd8a68f6
233 changed files with 470 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/kubelet_node_status_test.go
View File

@@ -96,7 +96,7 @@ func generateImageTags() []string {
// that kubelet report up to maxNamesPerImageInNodeStatus tags.
count := rand.IntnRange(maxNamesPerImageInNodeStatus+1, maxImageTagsForTest+1)
for ; count > 0; count-- {
tagList = append(tagList, "k8s.gcr.io:v"+strconv.Itoa(count))
tagList = append(tagList, "gcr.io/google_containers:v"+strconv.Itoa(count))
}
return tagList
}
@@ -492,11 +492,11 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
// images will be sorted from max to min in node status.
Images: []v1.ContainerImage{
{
Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
Names: []string{"gcr.io/google_containers:v3", "gcr.io/google_containers:v4"},
SizeBytes: 456,
},
{
Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"},
Names: []string{"gcr.io/google_containers:v1", "gcr.io/google_containers:v2"},
SizeBytes: 123,
},
},
@@ -680,11 +680,11 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
},
Images: []v1.ContainerImage{
{
Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
Names: []string{"gcr.io/google_containers:v3", "gcr.io/google_containers:v4"},
SizeBytes: 456,
},
{
Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"},
Names: []string{"gcr.io/google_containers:v1", "gcr.io/google_containers:v2"},
SizeBytes: 123,
},
},