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

Move from k8s.gcr.io to registry.k8s.io

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas
2022-05-10 08:30:09 -04:00
parent aae07c6f7b
commit 50bea1dad8
232 changed files with 509 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/cmd/apps.sh
View File

@@ -36,7 +36,7 @@ run_daemonset_tests() {
# Template Generation should stay 1
kube::test::get_object_assert 'daemonsets bind' "{{${generation_field:?}}}" '1'
# Test set commands
kubectl set image daemonsets/bind "${kube_flags[@]:?}" "*=k8s.gcr.io/pause:test-cmd"
kubectl set image daemonsets/bind "${kube_flags[@]:?}" "*=registry.k8s.io/pause:test-cmd"
kube::test::get_object_assert 'daemonsets bind' "{{${generation_field:?}}}" '2'
kubectl set env daemonsets/bind "${kube_flags[@]:?}" foo=bar
kube::test::get_object_assert 'daemonsets bind' "{{${generation_field:?}}}" '3'
@@ -186,7 +186,7 @@ run_deployment_tests() {
create_and_use_new_namespace
kube::log::status "Testing deployments"
# Test kubectl create deployment (using default - old generator)
kubectl create deployment test-nginx-extensions --image=k8s.gcr.io/nginx:test-cmd
kubectl create deployment test-nginx-extensions --image=registry.k8s.io/nginx:test-cmd
# Post-Condition: Deployment "nginx" is created.
kube::test::get_object_assert 'deploy test-nginx-extensions' "{{${container_name_field:?}}}" 'nginx'
# and old generator was used, iow. old defaults are applied
@@ -199,7 +199,7 @@ run_deployment_tests() {
kubectl delete deployment test-nginx-extensions "${kube_flags[@]:?}"
# Test kubectl create deployment
kubectl create deployment test-nginx-apps --image=k8s.gcr.io/nginx:test-cmd
kubectl create deployment test-nginx-apps --image=registry.k8s.io/nginx:test-cmd
# Post-Condition: Deployment "nginx" is created.
kube::test::get_object_assert 'deploy test-nginx-apps' "{{${container_name_field:?}}}" 'nginx'
# and new generator was used, iow. new defaults are applied
@@ -221,11 +221,11 @@ run_deployment_tests() {
# Pre-Condition: No deployment exists.
kube::test::get_object_assert deployment "{{range.items}}{{${id_field:?}}}:{{end}}" ''
# Dry-run command
kubectl create deployment nginx-with-command --dry-run=client --image=k8s.gcr.io/nginx:test-cmd -- /bin/sleep infinity
kubectl create deployment nginx-with-command --dry-run=server --image=k8s.gcr.io/nginx:test-cmd -- /bin/sleep infinity
kubectl create deployment nginx-with-command --dry-run=client --image=registry.k8s.io/nginx:test-cmd -- /bin/sleep infinity
kubectl create deployment nginx-with-command --dry-run=server --image=registry.k8s.io/nginx:test-cmd -- /bin/sleep infinity
kube::test::get_object_assert deployment "{{range.items}}{{${id_field:?}}}:{{end}}" ''
# Command
kubectl create deployment nginx-with-command --image=k8s.gcr.io/nginx:test-cmd -- /bin/sleep infinity
kubectl create deployment nginx-with-command --image=registry.k8s.io/nginx:test-cmd -- /bin/sleep infinity
# Post-Condition: Deployment "nginx" is created.
kube::test::get_object_assert 'deploy nginx-with-command' "{{${container_name_field:?}}}" 'nginx'
# Clean up
@@ -259,7 +259,7 @@ run_deployment_tests() {
kube::test::get_object_assert deployment "{{range.items}}{{${id_field:?}}}:{{end}}" ''
kube::test::get_object_assert rs "{{range.items}}{{${id_field:?}}}:{{end}}" ''
# Create deployment
kubectl create deployment nginx-deployment --image=k8s.gcr.io/nginx:test-cmd
kubectl create deployment nginx-deployment --image=registry.k8s.io/nginx:test-cmd
# Wait for rs to come up.
kube::test::wait_object_assert rs "{{range.items}}{{${rs_replicas_field:?}}}{{end}}" '1'
# Delete the deployment with cascading strategy set to orphan.
@@ -656,7 +656,7 @@ run_rs_tests() {
# Test set commands
# Pre-condition: frontend replica set exists at generation 1
kube::test::get_object_assert 'rs frontend' "{{${generation_field:?}}}" '1'
kubectl set image rs/frontend "${kube_flags[@]:?}" "*=k8s.gcr.io/pause:test-cmd"
kubectl set image rs/frontend "${kube_flags[@]:?}" "*=registry.k8s.io/pause:test-cmd"
kube::test::get_object_assert 'rs frontend' "{{${generation_field:?}}}" '2'
kubectl set env rs/frontend "${kube_flags[@]:?}" foo=bar
kube::test::get_object_assert 'rs frontend' "{{${generation_field:?}}}" '3'

10
test/cmd/core.sh
View File

@@ -537,9 +537,9 @@ run_pod_tests() {
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'changed-with-yaml:'
## Patch pod from JSON can change image
# Command
kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "k8s.gcr.io/pause:3.7"}]}}'
kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "registry.k8s.io/pause:3.7"}]}}'
# Post-condition: valid-pod POD has expected image
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.7:'
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.7:'
# pod has field for kubectl patch field manager
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)
@@ -656,13 +656,13 @@ __EOF__
kubectl delete node node-v1-test "${kube_flags[@]}"
## kubectl edit can update the image field of a POD. tmp-editor.sh is a fake editor
echo -e "#!/usr/bin/env bash\n${SED} -i \"s/nginx/k8s.gcr.io\/serve_hostname/g\" \$1" > /tmp/tmp-editor.sh
echo -e "#!/usr/bin/env bash\n${SED} -i \"s/nginx/registry.k8s.io\/serve_hostname/g\" \$1" > /tmp/tmp-editor.sh
chmod +x /tmp/tmp-editor.sh
# Pre-condition: valid-pod POD has image nginx
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'nginx:'
grep -q 'Patch:' <<< "$(EDITOR=/tmp/tmp-editor.sh kubectl edit "${kube_flags[@]}" pods/valid-pod --output-patch=true)"
# Post-condition: valid-pod POD has image k8s.gcr.io/serve_hostname
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/serve_hostname:'
# Post-condition: valid-pod POD has image registry.k8s.io/serve_hostname
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/serve_hostname:'
# pod has field for kubectl edit field manager
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)
kube::test::if_has_string "${output_message}" 'kubectl-edit'

4
test/cmd/create.sh
View File

@@ -89,9 +89,9 @@ run_create_job_tests() {
create_and_use_new_namespace
# Test kubectl create job
kubectl create job test-job --image=k8s.gcr.io/nginx:test-cmd
kubectl create job test-job --image=registry.k8s.io/nginx:test-cmd
# Post-Condition: job nginx is created
kube::test::get_object_assert 'job test-job' "{{${image_field0:?}}}" 'k8s.gcr.io/nginx:test-cmd'
kube::test::get_object_assert 'job test-job' "{{${image_field0:?}}}" 'registry.k8s.io/nginx:test-cmd'
# Clean up
kubectl delete job test-job "${kube_flags[@]}"

6
test/cmd/diff.sh
View File

@@ -47,7 +47,7 @@ run_kubectl_diff_tests() {
# 1. the exit code for diff is 1 because it found a difference
# 2. the difference contains the changed image
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml || test $? -eq 1)
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
kube::test::if_has_string "${output_message}" 'registry.k8s.io/pause:3.4'
# Ensure diff only dry-runs and doesn't persist change
resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}')
@@ -55,7 +55,7 @@ run_kubectl_diff_tests() {
# Test found diff with server-side apply
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side || test $? -eq 1)
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
kube::test::if_has_string "${output_message}" 'registry.k8s.io/pause:3.4'
# Ensure diff --server-side only dry-runs and doesn't persist change
resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}')
@@ -86,7 +86,7 @@ run_kubectl_diff_tests() {
# 1. the exit code for diff is 1 because it found a difference
# 2. the difference contains the changed image
output_message=$(kubectl diff --server-side -f hack/testdata/pod-changed.yaml || test $? -eq 1)
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
kube::test::if_has_string "${output_message}" 'registry.k8s.io/pause:3.4'
## kubectl diff --prune
kubectl create ns nsb

16
test/cmd/legacy-script.sh
View File

@@ -67,15 +67,15 @@ KUBELET_HEALTHZ_PORT=${KUBELET_HEALTHZ_PORT:-10248}
SECURE_CTLRMGR_PORT=${SECURE_CTLRMGR_PORT:-10257}
PROXY_HOST=127.0.0.1 # kubectl only serves on localhost.
IMAGE_NGINX="k8s.gcr.io/nginx:1.7.9"
export IMAGE_DEPLOYMENT_R1="k8s.gcr.io/nginx:test-cmd" # deployment-revision1.yaml
IMAGE_NGINX="registry.k8s.io/nginx:1.7.9"
export IMAGE_DEPLOYMENT_R1="registry.k8s.io/nginx:test-cmd" # deployment-revision1.yaml
export IMAGE_DEPLOYMENT_R2="$IMAGE_NGINX" # deployment-revision2.yaml
export IMAGE_PERL="k8s.gcr.io/perl"
export IMAGE_PAUSE_V2="k8s.gcr.io/pause:2.0"
export IMAGE_DAEMONSET_R2="k8s.gcr.io/pause:latest"
export IMAGE_DAEMONSET_R2_2="k8s.gcr.io/nginx:test-cmd" # rollingupdate-daemonset-rv2.yaml
export IMAGE_STATEFULSET_R1="k8s.gcr.io/nginx-slim:0.7"
export IMAGE_STATEFULSET_R2="k8s.gcr.io/nginx-slim:0.8"
export IMAGE_PERL="registry.k8s.io/perl"
export IMAGE_PAUSE_V2="registry.k8s.io/pause:2.0"
export IMAGE_DAEMONSET_R2="registry.k8s.io/pause:latest"
export IMAGE_DAEMONSET_R2_2="registry.k8s.io/nginx:test-cmd" # rollingupdate-daemonset-rv2.yaml
export IMAGE_STATEFULSET_R1="registry.k8s.io/nginx-slim:0.7"
export IMAGE_STATEFULSET_R2="registry.k8s.io/nginx-slim:0.8"
# Expose kubectl directly for readability
PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH

6
test/conformance/image/Makefile
View File

@@ -15,9 +15,9 @@
# Build the conformance image.
#
# Usage:
# [ARCH=amd64] [REGISTRY="k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
# [ARCH=amd64] [REGISTRY="registry.k8s.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
REGISTRY?=k8s.gcr.io
REGISTRY?=registry.k8s.io
ARCH?=amd64
OUT_DIR?=_output
@@ -32,7 +32,7 @@ E2E_GO_RUNNER_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/go-runner && echo $(LOCA
CLUSTER_DIR?=$(shell pwd)/../../../cluster/
# This is defined in root Makefile, but some build contexts do not refer to them
KUBE_BASE_IMAGE_REGISTRY?=k8s.gcr.io
KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io
BASE_IMAGE_VERSION?=bullseye-v1.2.0
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}

14
test/conformance/image/README.md
View File

@@ -10,23 +10,23 @@
$ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl test/conformance/image/go-runner"
# Build for linux/amd64 (default)
# export REGISTRY=$HOST/$ORG to switch from k8s.gcr.io
# export REGISTRY=$HOST/$ORG to switch from registry.k8s.io
$ make push VERSION={target_version} ARCH=amd64
# ---> k8s.gcr.io/conformance-amd64:VERSION
# ---> k8s.gcr.io/conformance:VERSION (image with backwards-compatible naming)
# ---> registry.k8s.io/conformance-amd64:VERSION
# ---> registry.k8s.io/conformance:VERSION (image with backwards-compatible naming)
$ make push VERSION={target_version} ARCH=arm
# ---> k8s.gcr.io/conformance-arm:VERSION
# ---> registry.k8s.io/conformance-arm:VERSION
$ make push VERSION={target_version} ARCH=arm64
# ---> k8s.gcr.io/conformance-arm64:VERSION
# ---> registry.k8s.io/conformance-arm64:VERSION
$ make push VERSION={target_version} ARCH=ppc64le
# ---> k8s.gcr.io/conformance-ppc64le:VERSION
# ---> registry.k8s.io/conformance-ppc64le:VERSION
$ make push VERSION={target_version} ARCH=s390x
# ---> k8s.gcr.io/conformance-s390x:VERSION
# ---> registry.k8s.io/conformance-s390x:VERSION
```
If you don't want to push the images, run `make` or `make build` instead

2
test/conformance/image/conformance-e2e.yaml
View File

@@ -55,7 +55,7 @@ metadata:
spec:
containers:
- name: conformance-container
image: k8s.gcr.io/conformance-amd64:v1.14
image: registry.k8s.io/conformance-amd64:v1.14
imagePullPolicy: IfNotPresent
env:
- name: E2E_FOCUS

2
test/e2e/testing-manifests/cluster-dns/dns-backend-rc.yaml
View File

@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: dns-backend
image: k8s.gcr.io/example-dns-backend:v1
image: registry.k8s.io/example-dns-backend:v1
ports:
- name: backend-port
containerPort: 8000

2
test/e2e/testing-manifests/cluster-dns/dns-frontend-pod.yaml
View File

@@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: dns-frontend
image: k8s.gcr.io/example-dns-frontend:v1
image: registry.k8s.io/example-dns-frontend:v1
command:
- python
- client.py

2
test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml
View File

@@ -11,6 +11,6 @@ spec:
spec:
containers:
- name: echoheaders-https
image: k8s.gcr.io/e2e-test-images/echoserver:2.3
image: registry.k8s.io/e2e-test-images/echoserver:2.3
ports:
- containerPort: 8080

2
test/e2e/testing-manifests/ingress/http/rc.yaml
View File

@@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: echoheaders
image: k8s.gcr.io/e2e-test-images/echoserver:2.3
image: registry.k8s.io/e2e-test-images/echoserver:2.3
ports:
- containerPort: 8080
readinessProbe:

2
test/e2e/testing-manifests/ingress/http2/rc.yaml
View File

@@ -14,6 +14,6 @@ spec:
spec:
containers:
- name: echoheaders
image: k8s.gcr.io/e2e-test-images/echoserver:2.3
image: registry.k8s.io/e2e-test-images/echoserver:2.3
ports:
- containerPort: 8443

2
test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml
View File

@@ -11,6 +11,6 @@ spec:
spec:
containers:
- name: echoheaders-https
image: k8s.gcr.io/e2e-test-images/echoserver:2.3
image: registry.k8s.io/e2e-test-images/echoserver:2.3
ports:
- containerPort: 8080

2
test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml
View File

@@ -15,7 +15,7 @@ spec:
run: hostname
spec:
containers:
- image: k8s.gcr.io/e2e-test-images/agnhost:2.32
- image: registry.k8s.io/e2e-test-images/agnhost:2.32
command: ["/agnhost", "serve-hostname"]
imagePullPolicy: IfNotPresent
name: hostname

4
test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml
View File

@@ -14,13 +14,13 @@ spec:
run: hostname
spec:
containers:
- image: k8s.gcr.io/e2e-test-images/agnhost:2.32
- image: registry.k8s.io/e2e-test-images/agnhost:2.32
name: host1
args: ["serve-hostname", "--http=true", "--udp=false", "--port=8000"]
ports:
- protocol: TCP
containerPort: 8000
- image: k8s.gcr.io/e2e-test-images/agnhost:2.32
- image: registry.k8s.io/e2e-test-images/agnhost:2.32
name: host2
args: ["serve-hostname", "--http=true", "--udp=false", "--port=8080"]
ports:

2
test/e2e/testing-manifests/ingress/neg/rc.yaml
View File

@@ -15,7 +15,7 @@ spec:
run: hostname
spec:
containers:
- image: k8s.gcr.io/e2e-test-images/agnhost:2.32
- image: registry.k8s.io/e2e-test-images/agnhost:2.32
command: ["/agnhost", "serve-hostname"]
imagePullPolicy: IfNotPresent
name: hostname

2
test/e2e/testing-manifests/ingress/nginx/rc.yaml
View File

@@ -17,7 +17,7 @@ spec:
spec:
terminationGracePeriodSeconds: 0
containers:
- image: k8s.gcr.io/ingress-nginx/controller:v0.46.0
- image: registry.k8s.io/ingress-nginx/controller:v0.46.0
args:
- /nginx-ingress-controller
- --election-id=ingress-controller-leader

2
test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml
View File

@@ -11,6 +11,6 @@ spec:
spec:
containers:
- name: echoheaders-https
image: k8s.gcr.io/e2e-test-images/echoserver:2.3
image: registry.k8s.io/e2e-test-images/echoserver:2.3
ports:
- containerPort: 8080

2
test/e2e/testing-manifests/ingress/static-ip/rc.yaml
View File

@@ -11,6 +11,6 @@ spec:
spec:
containers:
- name: echoheaders-https
image: k8s.gcr.io/e2e-test-images/echoserver:2.3
image: registry.k8s.io/e2e-test-images/echoserver:2.3
ports:
- containerPort: 8080

4
test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml
View File

@@ -8,7 +8,7 @@ metadata:
spec:
containers:
- name: primary
image: k8s.gcr.io/e2e-test-images/agnhost:2.32
image: registry.k8s.io/e2e-test-images/agnhost:2.32
env:
- name: PRIMARY
value: "true"
@@ -21,7 +21,7 @@ spec:
- mountPath: /agnhost-primary-data
name: data
- name: sentinel
image: k8s.gcr.io/e2e-test-images/agnhost:2.32
image: registry.k8s.io/e2e-test-images/agnhost:2.32
env:
- name: SENTINEL
value: "true"

2
test/e2e/testing-manifests/sample-device-plugin.yaml
View File

@@ -32,7 +32,7 @@ spec:
hostPath:
path: /dev
containers:
- image: k8s.gcr.io/e2e-test-images/sample-device-plugin:1.3
- image: registry.k8s.io/e2e-test-images/sample-device-plugin:1.3
name: sample-device-plugin
env:
- name: PLUGIN_SOCK_DIR

2
test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml
View File

@@ -81,6 +81,6 @@ spec:
- name: root-mount
mountPath: /root
containers:
- image: "k8s.gcr.io/pause:3.7"
- image: "registry.k8s.io/pause:3.7"
name: pause

2
test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml
View File

@@ -17,7 +17,7 @@ spec:
version: v1
spec:
containers:
- image: k8s.gcr.io/servicelb:0.1
- image: registry.k8s.io/servicelb:0.1
imagePullPolicy: Always
livenessProbe:
httpGet:

2
test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml
View File

@@ -12,7 +12,7 @@ spec:
spec:
containers:
- name: netexec
image: k8s.gcr.io/e2e-test-images/agnhost:2.32
image: registry.k8s.io/e2e-test-images/agnhost:2.32
command: ["/agnhost", "netexec"]
ports:
- containerPort: 8080

2
test/e2e/testing-manifests/statefulset/cassandra/tester.yaml
View File

@@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: test-server
image: k8s.gcr.io/cassandra-e2e-test:0.1
image: registry.k8s.io/cassandra-e2e-test:0.1
imagePullPolicy: Always
ports:
- containerPort: 8080

2
test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
View File

@@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: etcd
image: k8s.gcr.io/etcd:3.2.24
image: registry.k8s.io/etcd:3.2.24
imagePullPolicy: Always
ports:
- containerPort: 2380

2
test/e2e/testing-manifests/statefulset/etcd/tester.yaml
View File

@@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: test-server
image: k8s.gcr.io/etcd-statefulset-e2e-test:0.0
image: registry.k8s.io/etcd-statefulset-e2e-test:0.0
imagePullPolicy: Always
ports:
- containerPort: 8080

6
test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml
View File

@@ -15,7 +15,7 @@ spec:
spec:
initContainers:
- name: install
image: k8s.gcr.io/galera-install:0.1
image: registry.k8s.io/galera-install:0.1
imagePullPolicy: Always
args:
- "--work-dir=/work-dir"
@@ -44,7 +44,7 @@ spec:
mountPath: "/etc/mysql"
containers:
- name: mysql
image: k8s.gcr.io/mysql-galera:e2e
image: registry.k8s.io/mysql-galera:e2e
ports:
- containerPort: 3306
name: mysql
@@ -58,7 +58,7 @@ spec:
- --defaults-file=/etc/mysql/my-galera.cnf
- --user=root
readinessProbe:
# TODO: If docker exec is buggy just use k8s.gcr.io/mysql-healthz:1.0
# TODO: If docker exec is buggy just use registry.k8s.io/mysql-healthz:1.0
exec:
command:
- sh

2
test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml
View File

@@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: test-server
image: k8s.gcr.io/mysql-e2e-test:0.1
image: registry.k8s.io/mysql-e2e-test:0.1
imagePullPolicy: Always
ports:
- containerPort: 8080

2
test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
View File

@@ -15,7 +15,7 @@ spec:
spec:
initContainers:
- name: install
image: k8s.gcr.io/e2e-test-images/pets/redis-installer:1.5
image: registry.k8s.io/e2e-test-images/pets/redis-installer:1.5
imagePullPolicy: Always
args:
- "--install-into=/opt"

2
test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
View File

@@ -15,7 +15,7 @@ spec:
spec:
initContainers:
- name: install
image: k8s.gcr.io/e2e-test-images/pets/zookeeper-installer:1.5
image: registry.k8s.io/e2e-test-images/pets/zookeeper-installer:1.5
imagePullPolicy: Always
args:
- "--install-into=/opt"

4
test/e2e/testing-manifests/storage-csi/any-volume-datasource/hello-populator-deploy.yaml
View File

@@ -56,11 +56,11 @@ spec:
serviceAccount: hello-account
containers:
- name: hello
image: k8s.gcr.io/sig-storage/hello-populator:v1.0.1
image: registry.k8s.io/sig-storage/hello-populator:v1.0.1
imagePullPolicy: IfNotPresent
args:
- --mode=controller
- --image-name=k8s.gcr.io/sig-storage/hello-populator:v1.0.1
- --image-name=registry.k8s.io/sig-storage/hello-populator:v1.0.1
- --http-endpoint=:8080
ports:
- containerPort: 8080

2
test/e2e/testing-manifests/storage-csi/any-volume-datasource/volume-data-source-validator/setup-data-source-validator.yaml
View File

@@ -17,7 +17,7 @@ spec:
serviceAccount: volume-data-source-validator
containers:
- name: volume-data-source-validator
image: k8s.gcr.io/sig-storage/volume-data-source-validator:v1.0.0
image: registry.k8s.io/sig-storage/volume-data-source-validator:v1.0.0
args:
- "--v=5"
- "--leader-election=false"

10
test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
View File

@@ -21,7 +21,7 @@ spec:
serviceAccountName: csi-gce-pd-controller-sa
containers:
- name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1
image: registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@@ -39,7 +39,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@@ -73,7 +73,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0
image: registry.k8s.io/sig-storage/csi-attacher:v3.4.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@@ -102,7 +102,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.4.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@@ -131,7 +131,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: gce-pd-driver
image: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.4.0
image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.4.0
args:
- "--v=5"
- "--endpoint=unix:/csi/csi.sock"

4
test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
View File

@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: csi-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@@ -48,7 +48,7 @@ spec:
- name: gce-pd-driver
securityContext:
privileged: true
image: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.2.2
image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.2.2
args:
- "--v=5"
- "--endpoint=unix:/csi/csi.sock"

16
test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml
View File

@@ -218,7 +218,7 @@ spec:
serviceAccountName: csi-hostpathplugin-sa
containers:
- name: hostpath
image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
args:
- "--drivername=hostpath.csi.k8s.io"
- "--v=5"
@@ -261,7 +261,7 @@ spec:
name: dev-dir
- name: csi-external-health-monitor-controller
image: k8s.gcr.io/sig-storage/csi-external-health-monitor-controller:v0.4.0
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.4.0
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
@@ -275,7 +275,7 @@ spec:
mountPath: /csi
- name: node-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.3.0
args:
- --v=5
- --csi-address=/csi/csi.sock
@@ -303,13 +303,13 @@ spec:
volumeMounts:
- mountPath: /csi
name: socket-dir
image: k8s.gcr.io/sig-storage/livenessprobe:v2.4.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.4.0
args:
- --csi-address=/csi/csi.sock
- --health-port=9898
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0
image: registry.k8s.io/sig-storage/csi-attacher:v3.3.0
args:
- --v=5
- --csi-address=/csi/csi.sock
@@ -323,7 +323,7 @@ spec:
name: socket-dir
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
args:
- -v=5
- --csi-address=/csi/csi.sock
@@ -338,7 +338,7 @@ spec:
name: socket-dir
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.3.0
args:
- -v=5
- -csi-address=/csi/csi.sock
@@ -352,7 +352,7 @@ spec:
name: socket-dir
- name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1
image: registry.k8s.io/sig-storage/csi-snapshotter:v4.2.1
args:
- -v=5
- --csi-address=/csi/csi.sock

2
test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml
View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: csi-mock
containers:
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0
image: registry.k8s.io/sig-storage/csi-attacher:v3.3.0
args:
- --v=5
- --csi-address=$(ADDRESS)

2
test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml
View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: csi-mock
containers:
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.3.0
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"

2
test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml
View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: csi-mock
containers:
- name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1
image: registry.k8s.io/sig-storage/csi-snapshotter:v4.2.1
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"

6
test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: csi-mock
containers:
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
args:
- "--csi-address=$(ADDRESS)"
# Topology support is needed for the pod rescheduling test
@@ -34,7 +34,7 @@ spec:
- mountPath: /csi
name: socket-dir
- name: driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.3.0
args:
- --v=5
- --csi-address=/csi/csi.sock
@@ -53,7 +53,7 @@ spec:
- mountPath: /registration
name: registration-dir
- name: mock
image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
args:
- "--drivername=mock.storage.k8s.io"
- "--nodeid=$(KUBE_NODE_NAME)"

8
test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml
View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: csi-mock
containers:
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
args:
- "--csi-address=$(ADDRESS)"
# Topology support is needed for the pod rescheduling test
@@ -35,7 +35,7 @@ spec:
- mountPath: /csi
name: socket-dir
- name: driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.3.0
args:
- --v=5
- --csi-address=/csi/csi.sock
@@ -53,7 +53,7 @@ spec:
- mountPath: /registration
name: registration-dir
- name: mock
image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
args:
- -v=5
- -nodeid=$(KUBE_NODE_NAME)
@@ -77,7 +77,7 @@ spec:
# test for directories or create them. It needs additional privileges
# for that.
- name: busybox
image: k8s.gcr.io/e2e-test-images/busybox:1.29-1
image: registry.k8s.io/e2e-test-images/busybox:1.29-1
securityContext:
privileged: true
command:

2
test/e2e_node/conformance/run_test.sh
View File

@@ -52,7 +52,7 @@ SKIP=${SKIP:-""}
TEST_ARGS=${TEST_ARGS:-""}
# REGISTRY is the image registry for node test image.
REGISTRY=${REGISTRY:-"k8s.gcr.io"}
REGISTRY=${REGISTRY:-"registry.k8s.io"}
# ARCH is the architecture of current machine, the script will use this to
# select corresponding test container image.

2
test/e2e_node/eviction_test.go
View File

@@ -1000,7 +1000,7 @@ func getMemhogPod(podName string, ctnName string, res v1.ResourceRequirements) *
Containers: []v1.Container{
{
Name: ctnName,
Image: "k8s.gcr.io/stress:v1",
Image: "registry.k8s.io/stress:v1",
ImagePullPolicy: "Always",
Env: env,
// 60 min timeout * 60s / tick per 10s = 360 ticks before timeout => ~11.11Mi/tick

2
test/e2e_node/gcp/gke_environment_test.go
View File

@@ -81,7 +81,7 @@ func checkIPTables() (err error) {
// checkPublicGCR checks the access to the public Google Container Registry by
// pulling the busybox image.
func checkPublicGCR() error {
const image = "k8s.gcr.io/busybox"
const image = "registry.k8s.io/busybox"
output, err := runCommand("docker", "images", "-q", image)
if err != nil {
return err

2
test/e2e_node/image_id_test.go
View File

@@ -31,7 +31,7 @@ import (
var _ = SIGDescribe("ImageID [NodeFeature: ImageID]", func() {
busyBoxImage := "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff"
busyBoxImage := "registry.k8s.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff"
f := framework.NewDefaultFramework("image-id-test")
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged

6
test/e2e_node/image_list.go
View File

@@ -55,9 +55,9 @@ const (
var NodePrePullImageList = sets.NewString(
imageutils.GetE2EImage(imageutils.Agnhost),
"gcr.io/cadvisor/cadvisor:v0.43.0",
"k8s.gcr.io/stress:v1",
"registry.k8s.io/stress:v1",
busyboxImage,
"k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
"registry.k8s.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
imageutils.GetE2EImage(imageutils.Nginx),
imageutils.GetE2EImage(imageutils.Perl),
imageutils.GetE2EImage(imageutils.Nonewprivs),
@@ -100,7 +100,7 @@ func updateImageAllowList() {
}
func getNodeProblemDetectorImage() string {
const defaultImage string = "k8s.gcr.io/node-problem-detector/node-problem-detector:v0.8.7"
const defaultImage string = "registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.7"
image := os.Getenv("NODE_PROBLEM_DETECTOR_IMAGE")
if image == "" {
image = defaultImage

2
test/e2e_node/remote/node_conformance.go
View File

@@ -56,7 +56,7 @@ func commandToString(c *exec.Cmd) string {
// Image path constants.
const (
conformanceRegistry = "k8s.gcr.io"
conformanceRegistry = "registry.k8s.io"
conformanceArch = runtime.GOARCH
conformanceTarfile = "node_conformance.tar"
conformanceTestBinary = "e2e_node.test"

2
test/fixtures/doc-yaml/admin/high-availability/etcd.yaml vendored
View File

@@ -5,7 +5,7 @@ metadata:
spec:
hostNetwork: true
containers:
- image: k8s.gcr.io/etcd:2.0.9
- image: registry.k8s.io/etcd:2.0.9
name: etcd-container
command:
- /usr/local/bin/etcd

2
test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml vendored
View File

@@ -6,7 +6,7 @@ spec:
hostNetwork: true
containers:
- name: kube-apiserver
image: k8s.gcr.io/kube-apiserver:9680e782e08a1a1c94c656190011bd02
image: registry.k8s.io/kube-apiserver:9680e782e08a1a1c94c656190011bd02
command:
- /bin/sh
- -c

2
test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml vendored
View File

@@ -10,7 +10,7 @@ spec:
- /usr/local/bin/kube-controller-manager --master=127.0.0.1:8080 --cluster-name=e2e-test-bburns
--cluster-cidr=10.245.0.0/16 --allocate-node-cidrs=true --cloud-provider=gce --service-account-private-key-file=/srv/kubernetes/server.key
--v=2 1>>/var/log/kube-controller-manager.log --leader-elect 2>&1
image: k8s.gcr.io/kube-controller-manager:fda24638d51a48baa13c35337fcd4793
image: registry.k8s.io/kube-controller-manager:fda24638d51a48baa13c35337fcd4793
livenessProbe:
httpGet:
path: /healthz

2
test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml vendored
View File

@@ -6,7 +6,7 @@ spec:
hostNetwork: true
containers:
- name: kube-scheduler
image: k8s.gcr.io/kube-scheduler:34d0b8f8b31e27937327961528739bc9
image: registry.k8s.io/kube-scheduler:34d0b8f8b31e27937327961528739bc9
command:
- /bin/sh
- -c

2
test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml vendored
View File

@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: kubernetes-serve-hostname
image: k8s.gcr.io/serve_hostname
image: registry.k8s.io/serve_hostname
resources:
limits:
cpu: "3"

2
test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml vendored
View File

@@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: kubernetes-serve-hostname
image: k8s.gcr.io/serve_hostname
image: registry.k8s.io/serve_hostname
resources:
limits:
cpu: "1"

6
test/fixtures/doc-yaml/user-guide/multi-pod.yaml vendored
View File

@@ -10,7 +10,7 @@ metadata:
spec:
containers:
- name: master
image: k8s.gcr.io/e2e-test-images/redis:5.0.5-alpine
image: registry.k8s.io/e2e-test-images/redis:5.0.5-alpine
env:
- name: MASTER
value: "true"
@@ -23,7 +23,7 @@ spec:
- mountPath: /redis-master-data
name: data
- name: sentinel
image: k8s.gcr.io/e2e-test-images/redis:5.0.5-alpine
image: registry.k8s.io/e2e-test-images/redis:5.0.5-alpine
env:
- name: SENTINEL
value: "true"
@@ -42,7 +42,7 @@ metadata:
spec:
containers:
- name: kubernetes-serve-hostname
image: k8s.gcr.io/e2e-test-images/agnhost:2.32
image: registry.k8s.io/e2e-test-images/agnhost:2.32
command: ["/agnhost", "serve-hostname"]
resources:
limits:

2
test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml vendored
View File

@@ -30,7 +30,7 @@ items:
spec:
containers:
- name: kubernetes-serve-hostname
image: k8s.gcr.io/e2e-test-images/agnhost:2.32
image: registry.k8s.io/e2e-test-images/agnhost:2.32
command: ["/agnhost", "serve-hostname"]
resources:
limits:

4
test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml vendored
View File

@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: mock-container
image: k8s.gcr.io/pause:3.7
image: registry.k8s.io/pause:3.7
---
apiVersion: v1
kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: mock-container
image: k8s.gcr.io/pause:3.7
image: registry.k8s.io/pause:3.7

2
test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml vendored
View File

@@ -14,4 +14,4 @@ spec:
spec:
containers:
- name: mock-container
image: k8s.gcr.io/pause:3.7
image: registry.k8s.io/pause:3.7

2
test/images/Makefile
View File

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
REGISTRY ?= k8s.gcr.io/e2e-test-images
REGISTRY ?= registry.k8s.io/e2e-test-images
GOARM ?= 7
DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v5.1.0-2

8
test/images/README.md
View File

@@ -130,7 +130,7 @@ To build AND push an image, the following command can be used:
make all-push WHAT=agnhost
```
By default, the images will be tagged and pushed under the `k8s.gcr.io/e2e-test-images`
By default, the images will be tagged and pushed under the `registry.k8s.io/e2e-test-images`
registry. That can changed by running this command instead:
```bash
@@ -141,7 +141,7 @@ REGISTRY=foo_registry make all-push WHAT=agnhost
require the `agnhost` image to be published in an authenticated repo as well:
```bash
REGISTRY=k8s.gcr.io/e2e-test-images make all-push WHAT=agnhost
REGISTRY=registry.k8s.io/e2e-test-images make all-push WHAT=agnhost
REGISTRY=gcr.io/k8s-authenticated-test make all-push WHAT=agnhost
```
@@ -191,8 +191,8 @@ https://testgrid.k8s.io/sig-testing-images#post-kubernetes-push-e2e-agnhost-test
will be triggered. The postsubmit job will push the images to the `gcr.io/k8s-staging-e2e-test-images` registry. You can use the image
from the staging registry to do more testing if required. All the postsubmit jobs and their logs for all the images can be seen in
[testgrid](https://testgrid.k8s.io/sig-testing-images) which is helpful for troubleshooting. Note that these images are not the same as used by the e2e jobs and still need to be promoted to the final registry.
1. The next step is to promote the image to the `k8s.gcr.io/e2e-test-images` registry by adding a line in
[kubernetes/k8s.io](https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-e2e-test-images/images.yaml). See this [pull request](https://github.com/kubernetes/k8s.io/pull/1804) for an example You will need the image manifest list's digest, which can be obtained by using [manifest-tool](https://github.com/estesp/manifest-tool):
1. The next step is to promote the image to the `registry.k8s.io/e2e-test-images` registry by adding a line in
[kubernetes/k8s.io](https://github.com/kubernetes/k8s.io/blob/main/registry.k8s.io/images/k8s-staging-e2e-test-images/images.yaml). See this [pull request](https://github.com/kubernetes/k8s.io/pull/1804) for an example You will need the image manifest list's digest, which can be obtained by using [manifest-tool](https://github.com/estesp/manifest-tool):
```bash
manifest-tool inspect --raw gcr.io/k8s-staging-e2e-test-images/${IMAGE_NAME}:${VERSION} | jq '.[0].Digest'

14
test/images/agnhost/README.md
View File

@@ -32,7 +32,7 @@ For example, let's consider the following `pod.yaml` file:
containers:
- args:
- dns-suffix
image: k8s.gcr.io/e2e-test-images/agnhost:2.14
image: registry.k8s.io/e2e-test-images/agnhost:2.14
name: agnhost
dnsConfig:
nameservers:
@@ -201,7 +201,7 @@ Usage:
```console
guestbook="test/e2e/testing-manifests/guestbook"
sed_expr="s|{{.AgnhostImage}}|k8s.gcr.io/e2e-test-images/agnhost:2.14|"
sed_expr="s|{{.AgnhostImage}}|registry.k8s.io/e2e-test-images/agnhost:2.14|"
# create the services.
kubectl create -f ${guestbook}/frontend-service.yaml
@@ -306,14 +306,14 @@ Examples:
```console
docker run -i \
k8s.gcr.io/e2e-test-images/agnhost:2.29 \
registry.k8s.io/e2e-test-images/agnhost:2.29 \
logs-generator --log-lines-total 10 --run-duration 1s
```
```console
kubectl run logs-generator \
--generator=run-pod/v1 \
--image=k8s.gcr.io/e2e-test-images/agnhost:2.29 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.29 \
--restart=Never \
-- logs-generator -t 10 -d 1s
```
@@ -492,7 +492,7 @@ Usage:
```console
kubectl run test-agnhost \
--generator=run-pod/v1 \
--image=k8s.gcr.io/e2e-test-images/agnhost:2.14 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.14 \
--restart=Never \
--env "POD_IP=<POD_IP>" \
--env "NODE_IP=<NODE_IP>" \
@@ -547,7 +547,7 @@ Usage:
```console
kubectl run test-agnhost \
--generator=run-pod/v1 \
--image=k8s.gcr.io/e2e-test-images/agnhost:2.21 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.21 \
--restart=Never \
--env "BIND_ADDRESS=localhost" \
--env "BIND_PORT=8080" \
@@ -667,6 +667,6 @@ The Windows `agnhost` image includes a `nc` binary that is 100% compliant with i
## Image
The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.35` for both Linux and
The image can be found at `registry.k8s.io/e2e-test-images/agnhost:2.35` for both Linux and
Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`, `mcr.microsoft.com/windows/nanoserver:20H2`, and
`mcr.microsoft.com/windows/nanoserver:ltsc2022`).

10
test/images/nonroot/BASEIMAGE
View File

@@ -1,8 +1,8 @@
linux/amd64=k8s.gcr.io/debian-base-amd64:v1.0.0
linux/arm=k8s.gcr.io/debian-base-arm:v1.0.0
linux/arm64=k8s.gcr.io/debian-base-arm64:v1.0.0
linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:v1.0.0
linux/s390x=k8s.gcr.io/debian-base-s390x:v1.0.0
linux/amd64=registry.k8s.io/debian-base-amd64:v1.0.0
linux/arm=registry.k8s.io/debian-base-arm:v1.0.0
linux/arm64=registry.k8s.io/debian-base-arm64:v1.0.0
linux/ppc64le=registry.k8s.io/debian-base-ppc64le:v1.0.0
linux/s390x=registry.k8s.io/debian-base-s390x:v1.0.0
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022

10
test/images/pets/peer-finder/BASEIMAGE
View File

@@ -1,5 +1,5 @@
linux/amd64=k8s.gcr.io/debian-base-amd64:0.4.1
linux/arm=k8s.gcr.io/debian-base-arm:0.4.1
linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1
linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1
linux/s390x=k8s.gcr.io/debian-base-s390x:0.4.1
linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1
linux/arm=registry.k8s.io/debian-base-arm:0.4.1
linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1
linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1
linux/s390x=registry.k8s.io/debian-base-s390x:0.4.1

8
test/images/pets/redis-installer/BASEIMAGE
View File

@@ -1,4 +1,4 @@
linux/amd64=k8s.gcr.io/debian-base-amd64:0.4.1
linux/arm=k8s.gcr.io/debian-base-arm:0.4.1
linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1
linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1
linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1
linux/arm=registry.k8s.io/debian-base-arm:0.4.1
linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1
linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1

2
test/images/pets/redis-installer/README.md
View File

@@ -4,7 +4,7 @@ The image in this directory is the init container for contrib/pets/redis but for
You can execute the image locally via:
```
docker run -it k8s.gcr.io/redis-install-3.2.0:e2e --cmd --install-into=/opt --work-dir=/work-dir
docker run -it registry.k8s.io/redis-install-3.2.0:e2e --cmd --install-into=/opt --work-dir=/work-dir
```
To share the installation with other containers mount the appropriate volumes as `--install-into` and `--work-dir`, where `install-into` is the directory to install redis into, and `work-dir` is the directory to install the user/admin supplied on-{start,change} hook scripts.

8
test/images/pets/zookeeper-installer/BASEIMAGE
View File

@@ -1,4 +1,4 @@
linux/amd64=k8s.gcr.io/debian-base-amd64:0.4.1
linux/arm=k8s.gcr.io/debian-base-arm:0.4.1
linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1
linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1
linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1
linux/arm=registry.k8s.io/debian-base-arm:0.4.1
linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1
linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1

2
test/images/pets/zookeeper-installer/README.md
View File

@@ -4,7 +4,7 @@ The image in this directory is the init container for contrib/pets/zookeeper but
You can execute the image locally via:
```
docker run -it k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e --cmd --install-into=/opt --work-dir=/work-dir
docker run -it registry.k8s.io/zookeeper-install-3.5.0-alpha:e2e --cmd --install-into=/opt --work-dir=/work-dir
```
To share the installation with other containers mount the appropriate volumes as `--install-into` and `--work-dir`, where `install-into` is the directory to install zookeeper into, and `work-dir` is the directory to install the user/admin supplied on-{start,change} hook scripts.

10
test/images/regression-issue-74839/BASEIMAGE
View File

@@ -1,5 +1,5 @@
linux/amd64=k8s.gcr.io/debian-base-amd64:v1.0.0
linux/arm=k8s.gcr.io/debian-base-arm:v1.0.0
linux/arm64=k8s.gcr.io/debian-base-arm64:v1.0.0
linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:v1.0.0
linux/s390x=k8s.gcr.io/debian-base-s390x:v1.0.0
linux/amd64=registry.k8s.io/debian-base-amd64:v1.0.0
linux/arm=registry.k8s.io/debian-base-arm:v1.0.0
linux/arm64=registry.k8s.io/debian-base-arm64:v1.0.0
linux/ppc64le=registry.k8s.io/debian-base-ppc64le:v1.0.0
linux/s390x=registry.k8s.io/debian-base-s390x:v1.0.0

10
test/images/resource-consumer/BASEIMAGE
View File

@@ -1,8 +1,8 @@
linux/amd64=k8s.gcr.io/debian-base-amd64:0.4.1
linux/arm=k8s.gcr.io/debian-base-arm:0.4.1
linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1
linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1
linux/s390x=k8s.gcr.io/debian-base-s390x:0.4.1
linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1
linux/arm=registry.k8s.io/debian-base-arm:0.4.1
linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1
linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1
linux/s390x=registry.k8s.io/debian-base-s390x:0.4.1
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022

2
test/images/sample-apiserver/Makefile
View File

@@ -25,7 +25,7 @@ export
# Get without building to populate module cache
# Then, get with OS/ARCH-specific env to build
bin:
docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:${KUBE_CROSS_VERSION} \
docker run --rm -i -v "${TARGET}:${TARGET}:Z" registry.k8s.io/build-image/kube-cross:${KUBE_CROSS_VERSION} \
/bin/bash -c "\
mkdir -p /go/src /go/bin && \
GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \

2
test/images/windows/Makefile
View File

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
REGISTRY ?= k8s.gcr.io/e2e-test-images
REGISTRY ?= registry.k8s.io/e2e-test-images
REMOTE_DOCKER_URL ?=
DOCKER_CERT_PATH ?= "$(HOME)/.docker"
export

2
test/integration/benchmark-controller.json
View File

@@ -17,7 +17,7 @@
"spec": {
"containers": [{
"name": "test-container",
"image": "k8s.gcr.io/pause:3.7"
"image": "registry.k8s.io/pause:3.7"
}]
}
}

2
test/integration/controlplane/synthetic_controlplane_test.go
View File

@@ -420,7 +420,7 @@ var deploymentApps = `
"spec": {
"containers": [{
"name": "nginx",
"image": "k8s.gcr.io/nginx:1.7.9"
"image": "registry.k8s.io/nginx:1.7.9"
}]
}
}

2
test/integration/logs/benchmark/data/container.log
View File

@@ -1,2 +1,2 @@
# This is a manually created message. See https://github.com/kubernetes/kubernetes/issues/106652 for the real one.
Nov 19 02:13:48 kind-worker2 kubelet[250]: {"ts":1637288028968.0125,"caller":"kuberuntime/kuberuntime_manager.go:902","msg":"Creating container in pod","v":0,"container":{"Name":"terminate-cmd-rpn","Image":"k8s.gcr.io/e2e-test-images/busybox:1.29-2","Command":["sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"],"TerminationMessagePath":"/dev/termination-log"}}
Nov 19 02:13:48 kind-worker2 kubelet[250]: {"ts":1637288028968.0125,"caller":"kuberuntime/kuberuntime_manager.go:902","msg":"Creating container in pod","v":0,"container":{"Name":"terminate-cmd-rpn","Image":"registry.k8s.io/e2e-test-images/busybox:1.29-2","Command":["sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"],"TerminationMessagePath":"/dev/termination-log"}}

10
test/integration/logs/benchmark/load_test.go
View File

@@ -30,7 +30,7 @@ import (
func TestData(t *testing.T) {
container := v1.Container{
Command: []string{"sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"},
Image: "k8s.gcr.io/e2e-test-images/busybox:1.29-2",
Image: "registry.k8s.io/e2e-test-images/busybox:1.29-2",
Name: "terminate-cmd-rpn",
TerminationMessagePath: "/dev/termination-log",
}
@@ -142,7 +142,7 @@ func TestData(t *testing.T) {
},
},
},
printf: `Creating container in pod: [container &Container{Name:terminate-cmd-rpn,Image:k8s.gcr.io/e2e-test-images/busybox:1.29-2,Command:[sh -c
printf: `Creating container in pod: [container &Container{Name:terminate-cmd-rpn,Image:registry.k8s.io/e2e-test-images/busybox:1.29-2,Command:[sh -c
f=/restart-count/restartCount
count=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})
if [ $count -eq 1 ]; then
@@ -155,7 +155,7 @@ while true; do sleep 1; done
],Args:[],WorkingDir:,Ports:[]ContainerPort{},Env:[]EnvVar{},Resources:ResourceRequirements{Limits:ResourceList{},Requests:ResourceList{},},VolumeMounts:[]VolumeMount{},LivenessProbe:nil,ReadinessProbe:nil,Lifecycle:nil,TerminationMessagePath:/dev/termination-log,ImagePullPolicy:,SecurityContext:nil,Stdin:false,StdinOnce:false,TTY:false,EnvFrom:[]EnvFromSource{},TerminationMessagePolicy:,VolumeDevices:[]VolumeDevice{},StartupProbe:nil,}]
`,
structured: `"Creating container in pod" container=<
&Container{Name:terminate-cmd-rpn,Image:k8s.gcr.io/e2e-test-images/busybox:1.29-2,Command:[sh -c
&Container{Name:terminate-cmd-rpn,Image:registry.k8s.io/e2e-test-images/busybox:1.29-2,Command:[sh -c
f=/restart-count/restartCount
count=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})
if [ $count -eq 1 ]; then
@@ -169,9 +169,9 @@ while true; do sleep 1; done
>
`,
// This is what the output would look like with JSON object. Because of https://github.com/kubernetes/kubernetes/issues/106652 we get the string instead.
// json: `{"msg":"Creating container in pod","v":0,"container":{"name":"terminate-cmd-rpn","image":"k8s.gcr.io/e2e-test-images/busybox:1.29-2","command":["sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"],"resources":{},"terminationMessagePath":"/dev/termination-log"}}
// json: `{"msg":"Creating container in pod","v":0,"container":{"name":"terminate-cmd-rpn","image":"registry.k8s.io/e2e-test-images/busybox:1.29-2","command":["sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"],"resources":{},"terminationMessagePath":"/dev/termination-log"}}
// `,
json: `{"msg":"Creating container in pod","v":0,"container":"&Container{Name:terminate-cmd-rpn,Image:k8s.gcr.io/e2e-test-images/busybox:1.29-2,Command:[sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n],Args:[],WorkingDir:,Ports:[]ContainerPort{},Env:[]EnvVar{},Resources:ResourceRequirements{Limits:ResourceList{},Requests:ResourceList{},},VolumeMounts:[]VolumeMount{},LivenessProbe:nil,ReadinessProbe:nil,Lifecycle:nil,TerminationMessagePath:/dev/termination-log,ImagePullPolicy:,SecurityContext:nil,Stdin:false,StdinOnce:false,TTY:false,EnvFrom:[]EnvFromSource{},TerminationMessagePolicy:,VolumeDevices:[]VolumeDevice{},StartupProbe:nil,}"}
json: `{"msg":"Creating container in pod","v":0,"container":"&Container{Name:terminate-cmd-rpn,Image:registry.k8s.io/e2e-test-images/busybox:1.29-2,Command:[sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n],Args:[],WorkingDir:,Ports:[]ContainerPort{},Env:[]EnvVar{},Resources:ResourceRequirements{Limits:ResourceList{},Requests:ResourceList{},},VolumeMounts:[]VolumeMount{},LivenessProbe:nil,ReadinessProbe:nil,Lifecycle:nil,TerminationMessagePath:/dev/termination-log,ImagePullPolicy:,SecurityContext:nil,Stdin:false,StdinOnce:false,TTY:false,EnvFrom:[]EnvFromSource{},TerminationMessagePolicy:,VolumeDevices:[]VolumeDevice{},StartupProbe:nil,}"}
`,
stats: logStats{
TotalLines: 2,

2
test/integration/scheduler_perf/config/churn/pod-default.yaml
View File

@@ -4,5 +4,5 @@ metadata:
generateName: pod-churn-
spec:
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause

2
test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml
View File

@@ -16,7 +16,7 @@ spec:
matchLabels:
team: devops
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml
View File

@@ -16,7 +16,7 @@ spec:
matchLabels:
team: devops
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-default.yaml
View File

@@ -4,7 +4,7 @@ metadata:
generateName: pod-
spec:
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml
View File

@@ -5,7 +5,7 @@ metadata:
spec:
priority: 10
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-high-priority.yaml
View File

@@ -5,7 +5,7 @@ metadata:
spec:
priority: 10
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-large-cpu.yaml
View File

@@ -4,7 +4,7 @@ metadata:
generateName: pod-
spec:
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-low-priority.yaml
View File

@@ -5,7 +5,7 @@ metadata:
spec:
terminationGracePeriodSeconds: 0
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml
View File

@@ -18,7 +18,7 @@ spec:
team: devops
weight: 1
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml
View File

@@ -18,7 +18,7 @@ spec:
team: devops
weight: 1
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-node-affinity.yaml
View File

@@ -14,7 +14,7 @@ spec:
- zone1
- zone2
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml
View File

@@ -14,7 +14,7 @@ spec:
topologyKey: topology.kubernetes.io/zone
namespaces: ["sched-1", "sched-0"]
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml
View File

@@ -14,7 +14,7 @@ spec:
topologyKey: kubernetes.io/hostname
namespaces: ["sched-1", "sched-0"]
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml
View File

@@ -16,7 +16,7 @@ spec:
namespaces: ["sched-1", "sched-0"]
weight: 1
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml
View File

@@ -16,7 +16,7 @@ spec:
namespaces: ["sched-1", "sched-0"]
weight: 1
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml
View File

@@ -13,7 +13,7 @@ spec:
matchLabels:
color: blue
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-secret-volume.yaml
View File

@@ -4,7 +4,7 @@ metadata:
generateName: secret-volume-
spec:
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml
View File

@@ -13,7 +13,7 @@ spec:
matchLabels:
color: blue
containers:
- image: k8s.gcr.io/pause:3.7
- image: registry.k8s.io/pause:3.7
name: pause
ports:
- containerPort: 80

2
test/integration/statefulset/statefulset_test.go
View File

@@ -76,7 +76,7 @@ func TestVolumeTemplateNoopUpdate(t *testing.T) {
"terminationGracePeriodSeconds": 10,
"containers": [{
"name": "nginx",
"image": "k8s.gcr.io/nginx-slim:0.8",
"image": "registry.k8s.io/nginx-slim:0.8",
"ports": [{"containerPort": 80,"name": "web"}],
"volumeMounts": [{"name": "www","mountPath": "/usr/share/nginx/html"}]
}]

2
test/kubemark/resources/cluster-autoscaler_template.json
View File

@@ -14,7 +14,7 @@
"containers": [
{
"name": "cluster-autoscaler",
"image": "k8s.gcr.io/cluster-autoscaler:v1.0.0",
"image": "registry.k8s.io/cluster-autoscaler:v1.0.0",
"command": [
"./run.sh",
"--kubernetes=https://{{master_ip}}:443?inClusterConfig=0&useServiceAccount=0&auth=/kubeconfig/cluster_autoscaler.kubeconfig",

4
test/kubemark/resources/heapster_template.json
View File

@@ -33,7 +33,7 @@
"containers": [
{
"name": "heapster",
"image": "k8s.gcr.io/heapster:v1.3.0",
"image": "registry.k8s.io/heapster:v1.3.0",
"resources": {
"requests": {
"cpu": "{{METRICS_CPU}}m",
@@ -55,7 +55,7 @@
},
{
"name": "eventer",
"image": "k8s.gcr.io/heapster:v1.3.0",
"image": "registry.k8s.io/heapster:v1.3.0",
"resources": {
"requests": {
"memory": "{{EVENTER_MEM}}Ki"

2
test/kubemark/resources/hollow-node_template.yaml
View File

@@ -99,7 +99,7 @@ spec:
cpu: {{hollow_proxy_millicpu}}m
memory: {{hollow_proxy_mem_Ki}}Ki
- name: hollow-node-problem-detector
image: k8s.gcr.io/node-problem-detector/node-problem-detector:v0.8.9
image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.9
env:
- name: NODE_NAME
valueFrom:

6
test/kubemark/resources/kube_dns_template.yaml
View File

@@ -72,7 +72,7 @@ spec:
secretName: kubeconfig
containers:
- name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9
image: registry.k8s.io/k8s-dns-kube-dns-amd64:1.14.9
resources:
limits:
memory: 170Mi
@@ -120,7 +120,7 @@ spec:
- name: secret-volume
mountPath: /etc/secret-volume
- name: dnsmasq
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9
image: registry.k8s.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@@ -160,7 +160,7 @@ spec:
- name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9
image: registry.k8s.io/k8s-dns-sidecar-amd64:1.14.9
livenessProbe:
httpGet:
path: /metrics

2
test/kubemark/resources/start-kubemark-master.sh
View File

@@ -742,7 +742,7 @@ create-addonmanager-kubeconfig
# Setup docker flags and load images of the master components.
assemble-docker-flags
DOCKER_REGISTRY="k8s.gcr.io"
DOCKER_REGISTRY="registry.k8s.io"
load-docker-images
readonly audit_policy_file="/etc/audit_policy.config"

2
test/utils/image/csi_manifest.go
View File

@@ -27,7 +27,7 @@ import (
e2etestingmanifests "k8s.io/kubernetes/test/e2e/testing-manifests"
)
// All of the image tags are of the format k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3.
// All of the image tags are of the format registry.k8s.io/sig-storage/hostpathplugin:v1.7.3.
var imageRE = regexp.MustCompile(`^(.*)/([^/:]*):(.*)$`)
// appendCSIImageConfigs extracts image repo, name and version from

Some files were not shown because too many files have changed in this diff Show More