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

Merge pull request #109938 from dims/move-from-k8s.gcr.io-to-registry.k8s.io

Browse Source 
Move from k8s.gcr.io to registry.k8s.io
This commit is contained in:
Kubernetes Prow Robot
2022-05-31 13:45:23 -07:00
committed by GitHub
parent 5219122d0c 50bea1dad8
commit 78fb1fa9a2
232 changed files with 509 additions and 507 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{
Containers: []api.Container{
{
Name: "etcd-container",
Image: "k8s.gcr.io/etcd:2.0.9",
Image: "registry.k8s.io/etcd:2.0.9",
Command: []string{
"/usr/local/bin/etcd",
"--addr",
@@ -120,7 +120,7 @@ var benchmarkPod = api.Pod{
},
Ready: true,
RestartCount: 0,
Image: "k8s.gcr.io/etcd:2.0.9",
Image: "registry.k8s.io/etcd:2.0.9",
ImageID: "docker://b6b9a86dc06aa1361357ca1b105feba961f6a4145adca6c54e142c0be0fe87b0",
ContainerID: "docker://3cbbf818f1addfc252957b4504f56ef2907a313fe6afc47fc75373674255d46d",
},

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

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

2
pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -15922,7 +15922,7 @@ func schema_k8sio_api_core_v1_ContainerImage(ref common.ReferenceCallback) commo
Properties: map[string]spec.Schema{
"names": {
SchemaProps: spec.SchemaProps{
Description: "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
Description: "Names by which this image is known. e.g. [\"kubernetes.example/hyperkube:v1.0.7\", \"cloud-vendor.registry.example/cloud-vendor/hyperkube:v1.0.7\"]",
Type: []string{"array"},
Items: &spec.SchemaOrArray{
Schema: &spec.Schema{

2
pkg/kubelet/images/image_gc_manager_test.go
View File

@@ -35,7 +35,7 @@ import (
)
var zero time.Time
var sandboxImage = "k8s.gcr.io/pause-amd64:latest"
var sandboxImage = "registry.k8s.io/pause-amd64:latest"
func newRealImageGCManager(policy ImageGCPolicy, mockStatsProvider stats.Provider) (*realImageGCManager, *containertest.FakeRuntime) {
fakeRuntime := &containertest.FakeRuntime{}

14
pkg/kubelet/kubelet_node_status_test.go
View File

@@ -109,7 +109,7 @@ func generateImageTags() []string {
// that kubelet report up to MaxNamesPerImageInNodeStatus tags.
count := rand.IntnRange(nodestatus.MaxNamesPerImageInNodeStatus+1, maxImageTagsForTest+1)
for ; count > 0; count-- {
tagList = append(tagList, "k8s.gcr.io:v"+strconv.Itoa(count))
tagList = append(tagList, "registry.k8s.io:v"+strconv.Itoa(count))
}
return tagList
}
@@ -463,11 +463,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:v1", "k8s.gcr.io:v2"},
Names: []string{"registry.k8s.io:v1", "registry.k8s.io:v2"},
SizeBytes: 123,
},
{
Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
Names: []string{"registry.k8s.io:v3", "registry.k8s.io:v4"},
SizeBytes: 456,
},
},
@@ -661,11 +661,11 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
},
Images: []v1.ContainerImage{
{
Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"},
Names: []string{"registry.k8s.io:v1", "registry.k8s.io:v2"},
SizeBytes: 123,
},
{
Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
Names: []string{"registry.k8s.io:v3", "registry.k8s.io:v4"},
SizeBytes: 456,
},
},
@@ -890,11 +890,11 @@ func TestUpdateNodeStatusWithLease(t *testing.T) {
// images will be sorted from max to min in node status.
Images: []v1.ContainerImage{
{
Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"},
Names: []string{"registry.k8s.io:v1", "registry.k8s.io:v2"},
SizeBytes: 123,
},
{
Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
Names: []string{"registry.k8s.io:v3", "registry.k8s.io:v4"},
SizeBytes: 456,
},
},

4
pkg/kubelet/kubelet_test.go
View File

@@ -132,12 +132,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{"registry.k8s.io:v1", "registry.k8s.io:v2"},
Size: 123,
},
{
ID: "efg",
RepoTags: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
RepoTags: []string{"registry.k8s.io:v3", "registry.k8s.io:v4"},
Size: 456,
},
}

2
pkg/kubelet/nodestatus/setters_test.go
View File

@@ -1811,7 +1811,7 @@ func makeExpectedImageList(imageList []kubecontainer.Image, maxImages, maxNames
func makeImageTags(num int32) []string {
tags := make([]string, num)
for i := range tags {
tags[i] = "k8s.gcr.io:v" + strconv.Itoa(i)
tags[i] = "registry.k8s.io:v" + strconv.Itoa(i)
}
return tags
}

2
pkg/volume/plugins.go
View File

@@ -1074,7 +1074,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
Containers: []v1.Container{
{
Name: "pv-recycler",
Image: "k8s.gcr.io/debian-base:v2.0.0",
Image: "registry.k8s.io/debian-base:v2.0.0",
Command: []string{"/bin/sh"},
Args: []string{"-c", "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1"},
VolumeMounts: []v1.VolumeMount{

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

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

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

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

8
pkg/volume/util/recyclerclient/recycler_client_test.go
View File

@@ -88,8 +88,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 \"registry.k8s.io/busybox\""),
newEvent(v1.EventTypeNormal, "Successfully pulled image \"registry.k8s.io/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, ""),
@@ -97,8 +97,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 \"registry.k8s.io/busybox\""},
{v1.EventTypeNormal, "Successfully pulled image \"registry.k8s.io/busybox\""},
{v1.EventTypeNormal, "Created container with docker id 83d929aeac82"},
{v1.EventTypeNormal, "Started container with docker id 83d929aeac82"},
},

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

@@ -52,7 +52,7 @@ metadata:
name: testpod
spec:
containers:
- image: k8s.gcr.io/busybox
- image: registry.k8s.io/busybox
`,
false,
},
@@ -69,7 +69,7 @@ spec:
"spec": {
"containers": [
{
"image": "k8s.gcr.io/busybox"
"image": "registry.k8s.io/busybox"
}
]
}
@@ -85,7 +85,7 @@ kind: Pod
metadata:
name: testpod
spec:
- image: k8s.gcr.io/busybox
- image: registry.k8s.io/busybox
`,
true,
},