github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-19 08:15:01 +00:00
Code Issues 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

4
pkg/api/testing/deep_copy_test.go
View File

@@ -64,7 +64,7 @@ var benchmarkPod api.Pod = api.Pod{
Containers: []api.Container{
{
Name: "etcd-container",
Image: "k8s.gcr.io/etcd:2.0.9",
Image: "gcr.io/google_containers/etcd:2.0.9",
Command: []string{
"/usr/local/bin/etcd",
"--addr",
@@ -120,7 +120,7 @@ var benchmarkPod api.Pod = api.Pod{
},
Ready: true,
RestartCount: 0,
Image: "k8s.gcr.io/etcd:2.0.9",
Image: "gcr.io/google_containers/etcd:2.0.9",
ImageID: "docker://b6b9a86dc06aa1361357ca1b105feba961f6a4145adca6c54e142c0be0fe87b0",
ContainerID: "docker://3cbbf818f1addfc252957b4504f56ef2907a313fe6afc47fc75373674255d46d",
},

2
pkg/api/testing/replication_controller_example.json
View File

@@ -47,7 +47,7 @@
"containers": [
{
"name": "elasticsearch-logging",
"image": "k8s.gcr.io/elasticsearch:1.0",
"image": "gcr.io/google_containers/elasticsearch:1.0",
"ports": [
{
"name": "db",

2
pkg/kubectl/validation/testdata/v1/invalidPod1.json vendored
View File

@@ -11,7 +11,7 @@
"containers": [
{
"name": "master",
"image": "gcr.io/fake_project/fake_image:fake_tag",
"image": "gcr.io/fake_project/fake_image:fake_tag",
"args": "this is a bad command"
}
]

2
pkg/kubectl/validation/testdata/v1/invalidPod3.json vendored
View File

@@ -14,7 +14,7 @@
"containers": [
{
"name": "apache-php",
"image": "gcr.io/fake_project/fake_image:fake_tag",
"image": "gcr.io/fake_project/fake_image:fake_tag",
"ports": [
{
"name": "apache",

2
pkg/kubectl/validation/testdata/v1/invalidPod4.yaml vendored
View File

@@ -11,4 +11,4 @@ spec:
args:
-
command:
-
-

2
pkg/kubelet/dockershim/docker_sandbox.go
View File

@@ -36,7 +36,7 @@ import (
)
const (
defaultSandboxImage = "k8s.gcr.io/pause-amd64:3.0"
defaultSandboxImage = "gcr.io/google_containers/pause-amd64:3.0"
// Various default sandbox resources requests/limits.
defaultSandboxCPUshares int64 = 2

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,
},
},

4
pkg/kubelet/kubelet_test.go
View File

@@ -127,12 +127,12 @@ func newTestKubelet(t *testing.T, controllerAttachDetachEnabled bool) *TestKubel
imageList := []kubecontainer.Image{
{
ID: "abc",
RepoTags: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"},
RepoTags: []string{"gcr.io/google_containers:v1", "gcr.io/google_containers:v2"},
Size: 123,
},
{
ID: "efg",
RepoTags: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
RepoTags: []string{"gcr.io/google_containers:v3", "gcr.io/google_containers:v4"},
Size: 456,
},
}

4
pkg/volume/util/operationexecutor/operation_executor.go
View File

@@ -453,7 +453,7 @@ type MountedVolume struct {
// name: test-pd
// spec:
// containers:
// - image: k8s.gcr.io/test-webserver
// - image: gcr.io/google_containers/test-webserver
// name: test-container
// volumeMounts:
// - mountPath: /test-pd
@@ -491,7 +491,7 @@ type MountedVolume struct {
// name: test-pd
// spec:
// containers:
// - image: k8s.gcr.io/test-webserver
// - image: gcr.io/google_containers/test-webserver
// name: test-container
// volumeMounts:
// - mountPath: /test-pd

4
pkg/volume/util/operationexecutor/operation_executor_test.go
View File

@@ -493,7 +493,7 @@ func getTestPodWithSecret(podName, secretName string) *v1.Pod {
Containers: []v1.Container{
{
Name: "secret-volume-test",
Image: "k8s.gcr.io/mounttest:0.8",
Image: "gcr.io/google_containers/mounttest:0.8",
Args: []string{
"--file_content=/etc/secret-volume/data-1",
"--file_mode=/etc/secret-volume/data-1"},
@@ -532,7 +532,7 @@ func getTestPodWithGCEPD(podName, pdName string) *v1.Pod {
Containers: []v1.Container{
{
Name: "pd-volume-test",
Image: "k8s.gcr.io/mounttest:0.8",
Image: "gcr.io/google_containers/mounttest:0.8",
Args: []string{
"--file_content=/etc/pd-volume/data-1",
},

6
pkg/volume/util/util_test.go
View File

@@ -162,7 +162,7 @@ metadata:
name: testpod
spec:
containers:
- image: k8s.gcr.io/busybox
- image: gcr.io/google_containers/busybox
`,
false,
},
@@ -179,7 +179,7 @@ spec:
"spec": {
"containers": [
{
"image": "k8s.gcr.io/busybox"
"image": "gcr.io/google_containers/busybox"
}
]
}
@@ -195,7 +195,7 @@ kind: Pod
metadata:
name: testpod
spec:
- image: k8s.gcr.io/busybox
- image: gcr.io/google_containers/busybox
`,
true,
},

8
pkg/volume/util_test.go
View File

@@ -94,8 +94,8 @@ func TestRecyclerPod(t *testing.T) {
// Pod gets Running and Succeeded
newPodEvent(watch.Added, "podRecyclerSuccess", v1.PodPending, ""),
newEvent(v1.EventTypeNormal, "Successfully assigned recycler-for-podRecyclerSuccess to 127.0.0.1"),
newEvent(v1.EventTypeNormal, "pulling image \"k8s.gcr.io/busybox\""),
newEvent(v1.EventTypeNormal, "Successfully pulled image \"k8s.gcr.io/busybox\""),
newEvent(v1.EventTypeNormal, "pulling image \"gcr.io/google_containers/busybox\""),
newEvent(v1.EventTypeNormal, "Successfully pulled image \"gcr.io/google_containers/busybox\""),
newEvent(v1.EventTypeNormal, "Created container with docker id 83d929aeac82"),
newEvent(v1.EventTypeNormal, "Started container with docker id 83d929aeac82"),
newPodEvent(watch.Modified, "podRecyclerSuccess", v1.PodRunning, ""),
@@ -103,8 +103,8 @@ func TestRecyclerPod(t *testing.T) {
},
expectedEvents: []mockEvent{
{v1.EventTypeNormal, "Successfully assigned recycler-for-podRecyclerSuccess to 127.0.0.1"},
{v1.EventTypeNormal, "pulling image \"k8s.gcr.io/busybox\""},
{v1.EventTypeNormal, "Successfully pulled image \"k8s.gcr.io/busybox\""},
{v1.EventTypeNormal, "pulling image \"gcr.io/google_containers/busybox\""},
{v1.EventTypeNormal, "Successfully pulled image \"gcr.io/google_containers/busybox\""},
{v1.EventTypeNormal, "Created container with docker id 83d929aeac82"},
{v1.EventTypeNormal, "Started container with docker id 83d929aeac82"},
},