names |
-Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] |
+Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] |
true |
string array |
|
diff --git a/examples/cluster-dns/dns-backend-rc.yaml b/examples/cluster-dns/dns-backend-rc.yaml
index 9649d367b5..4af1b0dcba 100644
--- a/examples/cluster-dns/dns-backend-rc.yaml
+++ b/examples/cluster-dns/dns-backend-rc.yaml
@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: dns-backend
- image: gcr.io/google_containers/example-dns-backend:v1
+ image: k8s.gcr.io/example-dns-backend:v1
ports:
- name: backend-port
containerPort: 8000
diff --git a/examples/cluster-dns/dns-frontend-pod.yaml b/examples/cluster-dns/dns-frontend-pod.yaml
index b424478383..4a7695f113 100644
--- a/examples/cluster-dns/dns-frontend-pod.yaml
+++ b/examples/cluster-dns/dns-frontend-pod.yaml
@@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: dns-frontend
- image: gcr.io/google_containers/example-dns-frontend:v1
+ image: k8s.gcr.io/example-dns-frontend:v1
command:
- python
- client.py
diff --git a/examples/cluster-dns/images/backend/Makefile b/examples/cluster-dns/images/backend/Makefile
index 67992ec266..bac8c89876 100644
--- a/examples/cluster-dns/images/backend/Makefile
+++ b/examples/cluster-dns/images/backend/Makefile
@@ -13,7 +13,7 @@
# limitations under the License.
TAG = v1
-PREFIX = gcr.io/google_containers
+PREFIX = staging-k8s.gcr.io
IMAGE = example-dns-backend
all: push
diff --git a/examples/cluster-dns/images/frontend/Makefile b/examples/cluster-dns/images/frontend/Makefile
index 2f6337545f..4c17fb59f5 100644
--- a/examples/cluster-dns/images/frontend/Makefile
+++ b/examples/cluster-dns/images/frontend/Makefile
@@ -13,7 +13,7 @@
# limitations under the License.
TAG = v1
-PREFIX = gcr.io/google_containers
+PREFIX = staging-k8s.gcr.io
IMAGE = example-dns-frontend
all: push
diff --git a/examples/explorer/Makefile b/examples/explorer/Makefile
index 35dd5bd7e7..f550a15a15 100644
--- a/examples/explorer/Makefile
+++ b/examples/explorer/Makefile
@@ -21,10 +21,10 @@ explorer: explorer.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./explorer.go
container: explorer
- docker build --pull -t gcr.io/google_containers/explorer:$(TAG) .
+ docker build --pull -t staging-k8s.gcr.io/explorer:$(TAG) .
push: container
- gcloud docker -- push gcr.io/google_containers/explorer:$(TAG)
+ gcloud docker -- push staging-k8s.gcr.io/explorer:$(TAG)
clean:
rm -f explorer
diff --git a/examples/explorer/pod.yaml b/examples/explorer/pod.yaml
index 2c26c3e174..0437a24922 100644
--- a/examples/explorer/pod.yaml
+++ b/examples/explorer/pod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: explorer
- image: gcr.io/google_containers/explorer:1.0
+ image: k8s.gcr.io/explorer:1.0
args: ["-port=8080"]
ports:
- containerPort: 8080
diff --git a/examples/guestbook-go/Makefile b/examples/guestbook-go/Makefile
index 9c63819ebc..ce17d07e80 100644
--- a/examples/guestbook-go/Makefile
+++ b/examples/guestbook-go/Makefile
@@ -15,9 +15,9 @@
# Build the guestbook-go example
# Usage:
-# [VERSION=v3] [REGISTRY="gcr.io/google_containers"] make build
+# [VERSION=v3] [REGISTRY="staging-k8s.gcr.io"] make build
VERSION?=v3
-REGISTRY?=gcr.io/google_containers
+REGISTRY?=staging-k8s.gcr.io
release: clean build push clean
diff --git a/examples/guestbook-go/guestbook-controller.json b/examples/guestbook-go/guestbook-controller.json
index 82c0e9134f..0e3553c865 100644
--- a/examples/guestbook-go/guestbook-controller.json
+++ b/examples/guestbook-go/guestbook-controller.json
@@ -22,7 +22,7 @@
"containers":[
{
"name":"guestbook",
- "image":"gcr.io/google_containers/guestbook:v3",
+ "image":"k8s.gcr.io/guestbook:v3",
"ports":[
{
"name":"http-server",
diff --git a/examples/guestbook/all-in-one/guestbook-all-in-one.yaml b/examples/guestbook/all-in-one/guestbook-all-in-one.yaml
index 7735c79898..a3415d6a99 100644
--- a/examples/guestbook/all-in-one/guestbook-all-in-one.yaml
+++ b/examples/guestbook/all-in-one/guestbook-all-in-one.yaml
@@ -30,7 +30,7 @@ spec:
spec:
containers:
- name: master
- image: gcr.io/google_containers/redis:e2e # or just image: redis
+ image: k8s.gcr.io/redis:e2e # or just image: redis
resources:
requests:
cpu: 100m
diff --git a/examples/guestbook/legacy/redis-master-controller.yaml b/examples/guestbook/legacy/redis-master-controller.yaml
index 0bdf976175..28208103b4 100644
--- a/examples/guestbook/legacy/redis-master-controller.yaml
+++ b/examples/guestbook/legacy/redis-master-controller.yaml
@@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: master
- image: gcr.io/google_containers/redis:e2e # or just image: redis
+ image: k8s.gcr.io/redis:e2e # or just image: redis
resources:
requests:
cpu: 100m
diff --git a/examples/guestbook/redis-master-deployment.yaml b/examples/guestbook/redis-master-deployment.yaml
index 3fbcc0f01c..d457a09934 100644
--- a/examples/guestbook/redis-master-deployment.yaml
+++ b/examples/guestbook/redis-master-deployment.yaml
@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: master
- image: gcr.io/google_containers/redis:e2e # or just image: redis
+ image: k8s.gcr.io/redis:e2e # or just image: redis
resources:
requests:
cpu: 100m
diff --git a/examples/kubectl-container/Makefile b/examples/kubectl-container/Makefile
index ea127f1514..a4094ff8bf 100644
--- a/examples/kubectl-container/Makefile
+++ b/examples/kubectl-container/Makefile
@@ -37,11 +37,11 @@ tag: .tag
container:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
- docker build --pull -t gcr.io/google_containers/kubectl:$(TAG) .
+ docker build --pull -t staging-k8s.gcr.io/kubectl:$(TAG) .
push: container
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
- gcloud docker -- push gcr.io/google_containers/kubectl:$(TAG)
+ gcloud docker -- push staging-k8s.gcr.io/kubectl:$(TAG)
clean:
rm -f kubectl
diff --git a/examples/kubectl-container/pod.json b/examples/kubectl-container/pod.json
index ed0ec6599c..540715a6c5 100644
--- a/examples/kubectl-container/pod.json
+++ b/examples/kubectl-container/pod.json
@@ -8,7 +8,7 @@
"containers": [
{
"name": "bb",
- "image": "gcr.io/google_containers/busybox",
+ "image": "k8s.gcr.io/busybox",
"command": [
"sh", "-c", "sleep 5; wget -O - ${KUBERNETES_RO_SERVICE_HOST}:${KUBERNETES_RO_SERVICE_PORT}/api/v1/pods/; sleep 10000"
],
@@ -36,7 +36,7 @@
},
{
"name": "kubectl",
- "image": "gcr.io/google_containers/kubectl:v0.18.0-120-gaeb4ac55ad12b1-dirty",
+ "image": "k8s.gcr.io/kubectl:v0.18.0-120-gaeb4ac55ad12b1-dirty",
"imagePullPolicy": "Always",
"args": [
"proxy", "-p", "8001"
diff --git a/examples/spark/spark-gluster/spark-master-controller.yaml b/examples/spark/spark-gluster/spark-master-controller.yaml
index d0b365b713..28cb6ac3fb 100644
--- a/examples/spark/spark-gluster/spark-master-controller.yaml
+++ b/examples/spark/spark-gluster/spark-master-controller.yaml
@@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: spark-master
- image: gcr.io/google_containers/spark:1.5.2_v1
+ image: k8s.gcr.io/spark:1.5.2_v1
command: ["/start-master"]
ports:
- containerPort: 7077
diff --git a/examples/spark/spark-gluster/spark-worker-controller.yaml b/examples/spark/spark-gluster/spark-worker-controller.yaml
index 69cc3cec95..0030d8a667 100644
--- a/examples/spark/spark-gluster/spark-worker-controller.yaml
+++ b/examples/spark/spark-gluster/spark-worker-controller.yaml
@@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: spark-worker
- image: gcr.io/google_containers/spark:1.5.2_v1
+ image: k8s.gcr.io/spark:1.5.2_v1
command: ["/start-worker"]
ports:
- containerPort: 8888
diff --git a/examples/spark/spark-master-controller.yaml b/examples/spark/spark-master-controller.yaml
index 60fb7ba8a1..ceaef078d2 100644
--- a/examples/spark/spark-master-controller.yaml
+++ b/examples/spark/spark-master-controller.yaml
@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: spark-master
- image: gcr.io/google_containers/spark:1.5.2_v1
+ image: k8s.gcr.io/spark:1.5.2_v1
command: ["/start-master"]
ports:
- containerPort: 7077
diff --git a/examples/spark/spark-worker-controller.yaml b/examples/spark/spark-worker-controller.yaml
index 9c748b3e04..3e5ed50ce0 100644
--- a/examples/spark/spark-worker-controller.yaml
+++ b/examples/spark/spark-worker-controller.yaml
@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: spark-worker
- image: gcr.io/google_containers/spark:1.5.2_v1
+ image: k8s.gcr.io/spark:1.5.2_v1
command: ["/start-worker"]
ports:
- containerPort: 8081
diff --git a/examples/spark/zeppelin-controller.yaml b/examples/spark/zeppelin-controller.yaml
index 56bb90d421..2f578fcfc2 100644
--- a/examples/spark/zeppelin-controller.yaml
+++ b/examples/spark/zeppelin-controller.yaml
@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: zeppelin
- image: gcr.io/google_containers/zeppelin:v0.5.6_v1
+ image: k8s.gcr.io/zeppelin:v0.5.6_v1
ports:
- containerPort: 8080
resources:
diff --git a/examples/storage/cassandra/image/Dockerfile b/examples/storage/cassandra/image/Dockerfile
index 45b7595123..5c4658d7f1 100644
--- a/examples/storage/cassandra/image/Dockerfile
+++ b/examples/storage/cassandra/image/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM gcr.io/google_containers/ubuntu-slim:0.9
+FROM k8s.gcr.io/ubuntu-slim:0.9
ARG BUILD_DATE
ARG VCS_REF
diff --git a/examples/storage/redis/redis-controller.yaml b/examples/storage/redis/redis-controller.yaml
index fcb5e67cd6..dab2f7f1ab 100644
--- a/examples/storage/redis/redis-controller.yaml
+++ b/examples/storage/redis/redis-controller.yaml
@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: redis
- image: gcr.io/google_containers/redis:v1
+ image: k8s.gcr.io/redis:v1
ports:
- containerPort: 6379
resources:
diff --git a/examples/storage/redis/redis-master.yaml b/examples/storage/redis/redis-master.yaml
index 57305a7a35..589de648f5 100644
--- a/examples/storage/redis/redis-master.yaml
+++ b/examples/storage/redis/redis-master.yaml
@@ -9,7 +9,7 @@ metadata:
spec:
containers:
- name: master
- image: gcr.io/google_containers/redis:v1
+ image: k8s.gcr.io/redis:v1
env:
- name: MASTER
value: "true"
diff --git a/examples/storage/redis/redis-sentinel-controller.yaml b/examples/storage/redis/redis-sentinel-controller.yaml
index da09e10cbb..6c4b14347a 100644
--- a/examples/storage/redis/redis-sentinel-controller.yaml
+++ b/examples/storage/redis/redis-sentinel-controller.yaml
@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: sentinel
- image: gcr.io/google_containers/redis:v1
+ image: k8s.gcr.io/redis:v1
env:
- name: SENTINEL
value: "true"
diff --git a/examples/storage/rethinkdb/admin-pod.yaml b/examples/storage/rethinkdb/admin-pod.yaml
index eac07f33a5..12163909d6 100644
--- a/examples/storage/rethinkdb/admin-pod.yaml
+++ b/examples/storage/rethinkdb/admin-pod.yaml
@@ -7,7 +7,7 @@ metadata:
name: rethinkdb-admin
spec:
containers:
- - image: gcr.io/google_containers/rethinkdb:1.16.0_1
+ - image: k8s.gcr.io/rethinkdb:1.16.0_1
name: rethinkdb
env:
- name: POD_NAMESPACE
diff --git a/examples/storage/rethinkdb/rc.yaml b/examples/storage/rethinkdb/rc.yaml
index 36b319191c..23becb6e88 100644
--- a/examples/storage/rethinkdb/rc.yaml
+++ b/examples/storage/rethinkdb/rc.yaml
@@ -16,7 +16,7 @@ spec:
role: replicas
spec:
containers:
- - image: gcr.io/google_containers/rethinkdb:1.16.0_1
+ - image: k8s.gcr.io/rethinkdb:1.16.0_1
name: rethinkdb
env:
- name: POD_NAMESPACE
diff --git a/examples/volumes/portworx/portworx-volume-pod.yaml b/examples/volumes/portworx/portworx-volume-pod.yaml
index c5f195911a..f44302f59e 100644
--- a/examples/volumes/portworx/portworx-volume-pod.yaml
+++ b/examples/volumes/portworx/portworx-volume-pod.yaml
@@ -4,7 +4,7 @@ metadata:
name: test-portworx-volume-pod
spec:
containers:
- - image: gcr.io/google_containers/test-webserver
+ - image: k8s.gcr.io/test-webserver
name: test-container
volumeMounts:
- mountPath: /test-portworx-volume
diff --git a/examples/volumes/portworx/portworx-volume-pvcpod.yaml b/examples/volumes/portworx/portworx-volume-pvcpod.yaml
index fb92b320f1..bef2d49656 100644
--- a/examples/volumes/portworx/portworx-volume-pvcpod.yaml
+++ b/examples/volumes/portworx/portworx-volume-pvcpod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
- image: gcr.io/google_containers/test-webserver
+ image: k8s.gcr.io/test-webserver
volumeMounts:
- name: test-volume
mountPath: /test-portworx-volume
diff --git a/examples/volumes/portworx/portworx-volume-pvcscpod.yaml b/examples/volumes/portworx/portworx-volume-pvcscpod.yaml
index 464bf5d8fd..8bdd513192 100644
--- a/examples/volumes/portworx/portworx-volume-pvcscpod.yaml
+++ b/examples/volumes/portworx/portworx-volume-pvcscpod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
- image: gcr.io/google_containers/test-webserver
+ image: k8s.gcr.io/test-webserver
volumeMounts:
- name: test-volume
mountPath: /test-portworx-volume
diff --git a/examples/volumes/scaleio/pod-sc-pvc.yaml b/examples/volumes/scaleio/pod-sc-pvc.yaml
index ceed7b567e..c94e7bc393 100644
--- a/examples/volumes/scaleio/pod-sc-pvc.yaml
+++ b/examples/volumes/scaleio/pod-sc-pvc.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: pod-sio-small-container
- image: gcr.io/google_containers/test-webserver
+ image: k8s.gcr.io/test-webserver
volumeMounts:
- mountPath: /test
name: test-data
diff --git a/examples/volumes/scaleio/pod.yaml b/examples/volumes/scaleio/pod.yaml
index 4b53b2b53c..b13ec668c7 100644
--- a/examples/volumes/scaleio/pod.yaml
+++ b/examples/volumes/scaleio/pod.yaml
@@ -4,7 +4,7 @@ metadata:
name: pod-0
spec:
containers:
- - image: gcr.io/google_containers/test-webserver
+ - image: k8s.gcr.io/test-webserver
name: pod-0
volumeMounts:
- mountPath: /test-pd
diff --git a/examples/volumes/vsphere/simple-statefulset.yaml b/examples/volumes/vsphere/simple-statefulset.yaml
index 3684a3b64e..d9de93c257 100644
--- a/examples/volumes/vsphere/simple-statefulset.yaml
+++ b/examples/volumes/vsphere/simple-statefulset.yaml
@@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google_containers/nginx-slim:0.8
+ image: k8s.gcr.io/nginx-slim:0.8
ports:
- containerPort: 80
name: web
diff --git a/examples/volumes/vsphere/vsphere-volume-pod.yaml b/examples/volumes/vsphere/vsphere-volume-pod.yaml
index 8660d62e49..0204ad3a59 100644
--- a/examples/volumes/vsphere/vsphere-volume-pod.yaml
+++ b/examples/volumes/vsphere/vsphere-volume-pod.yaml
@@ -4,7 +4,7 @@ metadata:
name: test-vmdk
spec:
containers:
- - image: gcr.io/google_containers/test-webserver
+ - image: k8s.gcr.io/test-webserver
name: test-container
volumeMounts:
- mountPath: /test-vmdk
diff --git a/examples/volumes/vsphere/vsphere-volume-pvcpod.yaml b/examples/volumes/vsphere/vsphere-volume-pvcpod.yaml
index 291664adaa..326c0031f3 100644
--- a/examples/volumes/vsphere/vsphere-volume-pvcpod.yaml
+++ b/examples/volumes/vsphere/vsphere-volume-pvcpod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
- image: gcr.io/google_containers/test-webserver
+ image: k8s.gcr.io/test-webserver
volumeMounts:
- name: test-volume
mountPath: /test-vmdk
diff --git a/examples/volumes/vsphere/vsphere-volume-pvcscpod.yaml b/examples/volumes/vsphere/vsphere-volume-pvcscpod.yaml
index 036aeb280c..c569a0b36d 100644
--- a/examples/volumes/vsphere/vsphere-volume-pvcscpod.yaml
+++ b/examples/volumes/vsphere/vsphere-volume-pvcscpod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
- image: gcr.io/google_containers/test-webserver
+ image: k8s.gcr.io/test-webserver
volumeMounts:
- name: test-volume
mountPath: /test-vmdk
diff --git a/hack/gen-swagger-doc/README.md b/hack/gen-swagger-doc/README.md
index eacf5119d8..5b35be4aff 100644
--- a/hack/gen-swagger-doc/README.md
+++ b/hack/gen-swagger-doc/README.md
@@ -3,7 +3,7 @@ This folder contains the sources needed to build the gen-swagger-doc container.
To build the container image,
```
-$ sudo docker build -t gcr.io/google_containers/gen-swagger-docs:v1 .
+$ sudo docker build -t k8s.gcr.io/gen-swagger-docs:v1 .
```
To generate the html docs,
diff --git a/hack/lib/swagger.sh b/hack/lib/swagger.sh
index 25bf16d818..af872d807e 100644
--- a/hack/lib/swagger.sh
+++ b/hack/lib/swagger.sh
@@ -117,7 +117,7 @@ kube::swagger::gen_api_ref_docs() {
-v "${swagger_spec_path}":/swagger-source:z \
-v "${register_file}":/register.go:z \
--net=host -e "https_proxy=${KUBERNETES_HTTPS_PROXY:-}" \
- gcr.io/google_containers/gen-swagger-docs:v8 \
+ k8s.gcr.io/gen-swagger-docs:v8 \
"${swagger_json_name}"
done
diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
index d1a3464303..8308b98ee6 100755
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -795,7 +795,7 @@ function start_kubelet {
--privileged=true \
-i \
--cidfile=$KUBELET_CIDFILE \
- gcr.io/google_containers/kubelet \
+ k8s.gcr.io/kubelet \
/kubelet --v=${LOG_LEVEL} --containerized ${priv_arg}--chaos-chance="${CHAOS_CHANCE}" --pod-manifest-path="${POD_MANIFEST_PATH}" --hostname-override="${HOSTNAME_OVERRIDE}" ${cloud_config_arg} \ --address="127.0.0.1" --kubeconfig "$CERT_DIR"/kubelet.kubeconfig --port="$KUBELET_PORT" --enable-controller-attach-detach="${ENABLE_CONTROLLER_ATTACH_DETACH}" &> $KUBELET_LOG &
fi
}
diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh
index 0528c2f740..0734ec051b 100755
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
@@ -37,15 +37,15 @@ KUBELET_HEALTHZ_PORT=${KUBELET_HEALTHZ_PORT:-10248}
CTLRMGR_PORT=${CTLRMGR_PORT:-10252}
PROXY_HOST=127.0.0.1 # kubectl only serves on localhost.
-IMAGE_NGINX="gcr.io/google-containers/nginx:1.7.9"
-IMAGE_DEPLOYMENT_R1="gcr.io/google-containers/nginx:test-cmd" # deployment-revision1.yaml
+IMAGE_NGINX="k8s.gcr.io/nginx:1.7.9"
+IMAGE_DEPLOYMENT_R1="k8s.gcr.io/nginx:test-cmd" # deployment-revision1.yaml
IMAGE_DEPLOYMENT_R2="$IMAGE_NGINX" # deployment-revision2.yaml
-IMAGE_PERL="gcr.io/google-containers/perl"
-IMAGE_PAUSE_V2="gcr.io/google-containers/pause:2.0"
-IMAGE_DAEMONSET_R2="gcr.io/google-containers/pause:latest"
-IMAGE_DAEMONSET_R2_2="gcr.io/google-containers/nginx:test-cmd" # rollingupdate-daemonset-rv2.yaml
-IMAGE_STATEFULSET_R1="gcr.io/google_containers/nginx-slim:0.7"
-IMAGE_STATEFULSET_R2="gcr.io/google_containers/nginx-slim:0.8"
+IMAGE_PERL="k8s.gcr.io/perl"
+IMAGE_PAUSE_V2="k8s.gcr.io/pause:2.0"
+IMAGE_DAEMONSET_R2="k8s.gcr.io/pause:latest"
+IMAGE_DAEMONSET_R2_2="k8s.gcr.io/nginx:test-cmd" # rollingupdate-daemonset-rv2.yaml
+IMAGE_STATEFULSET_R1="k8s.gcr.io/nginx-slim:0.7"
+IMAGE_STATEFULSET_R2="k8s.gcr.io/nginx-slim:0.8"
# Expose kubectl directly for readability
PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH
@@ -719,9 +719,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": "gcr.io/google_containers/pause-amd64:3.1"}]}}'
- # Post-condition: valid-pod POD has image gcr.io/google_containers/pause-amd64:3.1
- kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'gcr.io/google_containers/pause-amd64:3.1:'
+ 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-amd64:3.1"}]}}'
+ # Post-condition: valid-pod POD has expected image
+ kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause-amd64:3.1:'
## If resourceVersion is specified in the patch, it will be treated as a precondition, i.e., if the resourceVersion is different from that is stored in the server, the Patch should be rejected
ERROR_FILE="${KUBE_TEMP}/conflict-error"
@@ -802,13 +802,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 "#!/bin/bash\n${SED} -i \"s/nginx/gcr.io\/google_containers\/serve_hostname/g\" \$1" > /tmp/tmp-editor.sh
+ echo -e "#!/bin/bash\n${SED} -i \"s/nginx/k8s.gcr.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:'
[[ "$(EDITOR=/tmp/tmp-editor.sh kubectl edit "${kube_flags[@]}" pods/valid-pod --output-patch=true | grep Patch:)" ]]
- # Post-condition: valid-pod POD has image gcr.io/google_containers/serve_hostname
- kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'gcr.io/google_containers/serve_hostname:'
+ # 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:'
# cleaning
rm /tmp/tmp-editor.sh
@@ -2766,7 +2766,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=gcr.io/google-containers/nginx:test-cmd
+ kubectl create deployment test-nginx-extensions --image=k8s.gcr.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
@@ -2781,7 +2781,7 @@ run_deployment_tests() {
kubectl delete deployment test-nginx-extensions "${kube_flags[@]}"
# Test kubectl create deployment
- kubectl create deployment test-nginx-apps --image=gcr.io/google-containers/nginx:test-cmd --generator=deployment-basic/apps.v1beta1
+ kubectl create deployment test-nginx-apps --image=k8s.gcr.io/nginx:test-cmd --generator=deployment-basic/apps.v1beta1
# 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
@@ -2826,7 +2826,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=gcr.io/google-containers/nginx:test-cmd
+ kubectl create deployment nginx-deployment --image=k8s.gcr.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 cascade set to false.
@@ -3084,7 +3084,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[@]}" *=gcr.io/google-containers/pause:test-cmd
+ kubectl set image rs/frontend "${kube_flags[@]}" *=k8s.gcr.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'
@@ -3171,7 +3171,7 @@ run_daemonset_tests() {
# Template Generation should stay 1
kube::test::get_object_assert 'daemonsets bind' "{{${template_generation_field}}}" '1'
# Test set commands
- kubectl set image daemonsets/bind "${kube_flags[@]}" *=gcr.io/google-containers/pause:test-cmd
+ kubectl set image daemonsets/bind "${kube_flags[@]}" *=k8s.gcr.io/pause:test-cmd
kube::test::get_object_assert 'daemonsets bind' "{{${template_generation_field}}}" '2'
kubectl set env daemonsets/bind "${kube_flags[@]}" foo=bar
kube::test::get_object_assert 'daemonsets bind' "{{${template_generation_field}}}" '3'
diff --git a/hack/testdata/deployment-label-change1.yaml b/hack/testdata/deployment-label-change1.yaml
index cfcbae3d74..bcd1830427 100644
--- a/hack/testdata/deployment-label-change1.yaml
+++ b/hack/testdata/deployment-label-change1.yaml
@@ -13,6 +13,6 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:test-cmd
+ image: k8s.gcr.io/nginx:test-cmd
ports:
- containerPort: 80
diff --git a/hack/testdata/deployment-label-change2.yaml b/hack/testdata/deployment-label-change2.yaml
index 9e465bdb6b..a8bb4acd1a 100644
--- a/hack/testdata/deployment-label-change2.yaml
+++ b/hack/testdata/deployment-label-change2.yaml
@@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:test-cmd
+ image: k8s.gcr.io/nginx:test-cmd
ports:
- containerPort: 80
diff --git a/hack/testdata/deployment-multicontainer-resources.yaml b/hack/testdata/deployment-multicontainer-resources.yaml
index 533e2e46f4..b36ace094b 100644
--- a/hack/testdata/deployment-multicontainer-resources.yaml
+++ b/hack/testdata/deployment-multicontainer-resources.yaml
@@ -16,9 +16,9 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:test-cmd
+ image: k8s.gcr.io/nginx:test-cmd
ports:
- containerPort: 80
- name: perl
- image: gcr.io/google-containers/perl
+ image: k8s.gcr.io/perl
terminationGracePeriodSeconds: 0
diff --git a/hack/testdata/deployment-multicontainer.yaml b/hack/testdata/deployment-multicontainer.yaml
index 115888a029..117483957f 100644
--- a/hack/testdata/deployment-multicontainer.yaml
+++ b/hack/testdata/deployment-multicontainer.yaml
@@ -16,8 +16,8 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:test-cmd
+ image: k8s.gcr.io/nginx:test-cmd
ports:
- containerPort: 80
- name: perl
- image: gcr.io/google-containers/perl
+ image: k8s.gcr.io/perl
diff --git a/hack/testdata/deployment-revision1.yaml b/hack/testdata/deployment-revision1.yaml
index cfbec36c45..2bcb8edea7 100644
--- a/hack/testdata/deployment-revision1.yaml
+++ b/hack/testdata/deployment-revision1.yaml
@@ -16,6 +16,6 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:test-cmd
+ image: k8s.gcr.io/nginx:test-cmd
ports:
- containerPort: 80
diff --git a/hack/testdata/deployment-revision2.yaml b/hack/testdata/deployment-revision2.yaml
index 4b171f604b..1ed91c1375 100644
--- a/hack/testdata/deployment-revision2.yaml
+++ b/hack/testdata/deployment-revision2.yaml
@@ -16,6 +16,6 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:1.7.9
+ image: k8s.gcr.io/nginx:1.7.9
ports:
- containerPort: 80
diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml
index 73b83d6ba3..f296b68b9a 100644
--- a/hack/testdata/filter/pod-apply-selector.yaml
+++ b/hack/testdata/filter/pod-apply-selector.yaml
@@ -8,4 +8,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml
index 7ea1610de9..9b8f9f6e90 100644
--- a/hack/testdata/filter/pod-dont-apply.yaml
+++ b/hack/testdata/filter/pod-dont-apply.yaml
@@ -8,4 +8,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json
index 3ff562e6d9..2f88c0ac8e 100644
--- a/hack/testdata/multi-resource-json-modify.json
+++ b/hack/testdata/multi-resource-json-modify.json
@@ -43,7 +43,7 @@
"spec":{
"containers":[{
"name": "mock-container",
- "image": "gcr.io/google-containers/pause:2.0",
+ "image": "k8s.gcr.io/pause:2.0",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json
index 8ba2198e6d..869fdc7cbf 100644
--- a/hack/testdata/multi-resource-json.json
+++ b/hack/testdata/multi-resource-json.json
@@ -41,7 +41,7 @@
"spec":{
"containers":[{
"name": "mock-container",
- "image": "gcr.io/google-containers/pause:2.0",
+ "image": "k8s.gcr.io/pause:2.0",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json
index e0885c1024..af902efcfc 100644
--- a/hack/testdata/multi-resource-list-modify.json
+++ b/hack/testdata/multi-resource-list-modify.json
@@ -47,7 +47,7 @@
"spec":{
"containers":[{
"name": "mock-container",
- "image": "gcr.io/google-containers/pause:2.0",
+ "image": "k8s.gcr.io/pause:2.0",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json
index 8918223aed..17abca285a 100644
--- a/hack/testdata/multi-resource-list.json
+++ b/hack/testdata/multi-resource-list.json
@@ -45,7 +45,7 @@
"spec":{
"containers":[{
"name": "mock-container",
- "image": "gcr.io/google-containers/pause:2.0",
+ "image": "k8s.gcr.io/pause:2.0",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json
index 369d73399b..a28169c8ee 100644
--- a/hack/testdata/multi-resource-rclist-modify.json
+++ b/hack/testdata/multi-resource-rclist-modify.json
@@ -26,7 +26,7 @@
"spec":{
"containers":[{
"name": "mock-container",
- "image": "gcr.io/google-containers/pause:2.0",
+ "image": "k8s.gcr.io/pause:2.0",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
@@ -60,7 +60,7 @@
"spec":{
"containers":[{
"name": "mock-container",
- "image": "gcr.io/google-containers/pause:2.0",
+ "image": "k8s.gcr.io/pause:2.0",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json
index 369d73399b..a28169c8ee 100644
--- a/hack/testdata/multi-resource-rclist.json
+++ b/hack/testdata/multi-resource-rclist.json
@@ -26,7 +26,7 @@
"spec":{
"containers":[{
"name": "mock-container",
- "image": "gcr.io/google-containers/pause:2.0",
+ "image": "k8s.gcr.io/pause:2.0",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
@@ -60,7 +60,7 @@
"spec":{
"containers":[{
"name": "mock-container",
- "image": "gcr.io/google-containers/pause:2.0",
+ "image": "k8s.gcr.io/pause:2.0",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml
index 86fe824197..067b75630b 100644
--- a/hack/testdata/multi-resource-yaml-modify.yaml
+++ b/hack/testdata/multi-resource-yaml-modify.yaml
@@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: mock-container
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
ports:
- containerPort: 9949
protocol: TCP
diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml
index bef9e88b2c..642ebdb47e 100644
--- a/hack/testdata/multi-resource-yaml.yaml
+++ b/hack/testdata/multi-resource-yaml.yaml
@@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: mock-container
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
ports:
- containerPort: 9949
protocol: TCP
diff --git a/hack/testdata/null-propagation/deployment-l1.yaml b/hack/testdata/null-propagation/deployment-l1.yaml
index c5123abc5e..051fba91f8 100644
--- a/hack/testdata/null-propagation/deployment-l1.yaml
+++ b/hack/testdata/null-propagation/deployment-l1.yaml
@@ -10,4 +10,4 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:1.7.9
+ image: k8s.gcr.io/nginx:1.7.9
diff --git a/hack/testdata/null-propagation/deployment-l2.yaml b/hack/testdata/null-propagation/deployment-l2.yaml
index ffcbcc099b..3b2426a768 100644
--- a/hack/testdata/null-propagation/deployment-l2.yaml
+++ b/hack/testdata/null-propagation/deployment-l2.yaml
@@ -14,5 +14,5 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:1.7.9
+ image: k8s.gcr.io/nginx:1.7.9
terminationMessagePolicy: null
diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml
index a736a599d8..235d1c8f0f 100644
--- a/hack/testdata/pod-apply.yaml
+++ b/hack/testdata/pod-apply.yaml
@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/pod-with-api-env.yaml b/hack/testdata/pod-with-api-env.yaml
index aef451ac2f..3f76d210df 100644
--- a/hack/testdata/pod-with-api-env.yaml
+++ b/hack/testdata/pod-with-api-env.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
- image: gcr.io/google_containers/busybox
+ image: k8s.gcr.io/busybox
command: [ "/bin/sh", "-c", "env" ]
env:
- name: TEST_CMD_1
diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json
index ce59d9c100..6835de64de 100644
--- a/hack/testdata/pod-with-precision.json
+++ b/hack/testdata/pod-with-precision.json
@@ -9,7 +9,7 @@
"containers": [
{
"name": "kubernetes-pause",
- "image": "gcr.io/google_containers/pause-amd64:3.1"
+ "image": "k8s.gcr.io/pause-amd64:3.1"
}
],
"restartPolicy": "Never",
diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml
index 8ccadcecdb..92b504ef77 100644
--- a/hack/testdata/pod.yaml
+++ b/hack/testdata/pod.yaml
@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml
index aa86f28df4..badd10caa8 100644
--- a/hack/testdata/prune/a.yaml
+++ b/hack/testdata/prune/a.yaml
@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/prune/b.yaml b/hack/testdata/prune/b.yaml
index 6d212ead91..f92fbc47f0 100644
--- a/hack/testdata/prune/b.yaml
+++ b/hack/testdata/prune/b.yaml
@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml b/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml
index 6d98eda02c..18c0d4ea7a 100644
--- a/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml
+++ b/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml
@@ -13,6 +13,6 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:1.7.9
+ image: k8s.gcr.io/nginx:1.7.9
ports:
- containerPort: 80
diff --git a/hack/testdata/recursive/deployment/deployment/nginx.yaml b/hack/testdata/recursive/deployment/deployment/nginx.yaml
index f956f0272b..f416d6c25c 100644
--- a/hack/testdata/recursive/deployment/deployment/nginx.yaml
+++ b/hack/testdata/recursive/deployment/deployment/nginx.yaml
@@ -13,6 +13,6 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:1.7.9
+ image: k8s.gcr.io/nginx:1.7.9
ports:
- containerPort: 80
diff --git a/hack/testdata/recursive/deployment/nginx.yaml b/hack/testdata/recursive/deployment/nginx.yaml
index 9842a65da0..7988317f46 100644
--- a/hack/testdata/recursive/deployment/nginx.yaml
+++ b/hack/testdata/recursive/deployment/nginx.yaml
@@ -13,6 +13,6 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google-containers/nginx:1.7.9
+ image: k8s.gcr.io/nginx:1.7.9
ports:
- containerPort: 80
diff --git a/hack/testdata/rollingupdate-daemonset-rv2.yaml b/hack/testdata/rollingupdate-daemonset-rv2.yaml
index 3214dcffe9..b807e958dd 100644
--- a/hack/testdata/rollingupdate-daemonset-rv2.yaml
+++ b/hack/testdata/rollingupdate-daemonset-rv2.yaml
@@ -24,6 +24,6 @@ spec:
namespaces: []
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:latest
+ image: k8s.gcr.io/pause:latest
- name: app
- image: gcr.io/google-containers/nginx:test-cmd
+ image: k8s.gcr.io/nginx:test-cmd
diff --git a/hack/testdata/rollingupdate-daemonset.yaml b/hack/testdata/rollingupdate-daemonset.yaml
index c8a9cdca21..4bc77ed5bf 100644
--- a/hack/testdata/rollingupdate-daemonset.yaml
+++ b/hack/testdata/rollingupdate-daemonset.yaml
@@ -24,4 +24,4 @@ spec:
namespaces: []
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/rollingupdate-statefulset-rv2.yaml b/hack/testdata/rollingupdate-statefulset-rv2.yaml
index fec5493ab6..4e4fc4e609 100644
--- a/hack/testdata/rollingupdate-statefulset-rv2.yaml
+++ b/hack/testdata/rollingupdate-statefulset-rv2.yaml
@@ -18,7 +18,7 @@ spec:
terminationGracePeriodSeconds: 5
containers:
- name: nginx
- image: gcr.io/google_containers/nginx-slim:0.8
+ image: k8s.gcr.io/nginx-slim:0.8
ports:
- containerPort: 80
name: web
@@ -27,7 +27,7 @@ spec:
- -c
- 'while true; do sleep 1; done'
- name: pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
ports:
- containerPort: 81
name: web-2
diff --git a/hack/testdata/rollingupdate-statefulset.yaml b/hack/testdata/rollingupdate-statefulset.yaml
index 2acbf0f322..ffdc242e17 100644
--- a/hack/testdata/rollingupdate-statefulset.yaml
+++ b/hack/testdata/rollingupdate-statefulset.yaml
@@ -18,7 +18,7 @@ spec:
terminationGracePeriodSeconds: 5
containers:
- name: nginx
- image: gcr.io/google_containers/nginx-slim:0.7
+ image: k8s.gcr.io/nginx-slim:0.7
ports:
- containerPort: 80
name: web
diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml
index fba02b9017..aa767a2ea2 100644
--- a/hack/testdata/sorted-pods/sorted-pod1.yaml
+++ b/hack/testdata/sorted-pods/sorted-pod1.yaml
@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml
index f0ab7e906e..f05040569b 100644
--- a/hack/testdata/sorted-pods/sorted-pod2.yaml
+++ b/hack/testdata/sorted-pods/sorted-pod2.yaml
@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml
index 5d166786c7..e02c501fa1 100644
--- a/hack/testdata/sorted-pods/sorted-pod3.yaml
+++ b/hack/testdata/sorted-pods/sorted-pod3.yaml
@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
diff --git a/pkg/api/testing/deep_copy_test.go b/pkg/api/testing/deep_copy_test.go
index 27c9f42f6a..a93ccd00aa 100644
--- a/pkg/api/testing/deep_copy_test.go
+++ b/pkg/api/testing/deep_copy_test.go
@@ -64,7 +64,7 @@ var benchmarkPod api.Pod = api.Pod{
Containers: []api.Container{
{
Name: "etcd-container",
- Image: "gcr.io/google_containers/etcd:2.0.9",
+ Image: "k8s.gcr.io/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: "gcr.io/google_containers/etcd:2.0.9",
+ Image: "k8s.gcr.io/etcd:2.0.9",
ImageID: "docker://b6b9a86dc06aa1361357ca1b105feba961f6a4145adca6c54e142c0be0fe87b0",
ContainerID: "docker://3cbbf818f1addfc252957b4504f56ef2907a313fe6afc47fc75373674255d46d",
},
diff --git a/pkg/api/testing/replication_controller_example.json b/pkg/api/testing/replication_controller_example.json
index 70eef1cff3..8f858c023f 100644
--- a/pkg/api/testing/replication_controller_example.json
+++ b/pkg/api/testing/replication_controller_example.json
@@ -47,7 +47,7 @@
"containers": [
{
"name": "elasticsearch-logging",
- "image": "gcr.io/google_containers/elasticsearch:1.0",
+ "image": "k8s.gcr.io/elasticsearch:1.0",
"ports": [
{
"name": "db",
diff --git a/pkg/kubectl/validation/testdata/v1/invalidPod1.json b/pkg/kubectl/validation/testdata/v1/invalidPod1.json
index d935742d77..384d185791 100644
--- a/pkg/kubectl/validation/testdata/v1/invalidPod1.json
+++ b/pkg/kubectl/validation/testdata/v1/invalidPod1.json
@@ -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"
}
]
diff --git a/pkg/kubectl/validation/testdata/v1/invalidPod3.json b/pkg/kubectl/validation/testdata/v1/invalidPod3.json
index 4d99181dc0..69e0e85389 100644
--- a/pkg/kubectl/validation/testdata/v1/invalidPod3.json
+++ b/pkg/kubectl/validation/testdata/v1/invalidPod3.json
@@ -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",
diff --git a/pkg/kubectl/validation/testdata/v1/invalidPod4.yaml b/pkg/kubectl/validation/testdata/v1/invalidPod4.yaml
index f02bf7b336..a6958db5eb 100644
--- a/pkg/kubectl/validation/testdata/v1/invalidPod4.yaml
+++ b/pkg/kubectl/validation/testdata/v1/invalidPod4.yaml
@@ -11,4 +11,4 @@ spec:
args:
-
command:
- -
\ No newline at end of file
+ -
diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go
index b314969a6c..0f06049cff 100644
--- a/pkg/kubelet/dockershim/docker_sandbox.go
+++ b/pkg/kubelet/dockershim/docker_sandbox.go
@@ -37,7 +37,7 @@ import (
)
const (
- defaultSandboxImage = "gcr.io/google_containers/pause-amd64:3.1"
+ defaultSandboxImage = "k8s.gcr.io/pause-amd64:3.1"
// Various default sandbox resources requests/limits.
defaultSandboxCPUshares int64 = 2
diff --git a/pkg/kubelet/images/image_gc_manager_test.go b/pkg/kubelet/images/image_gc_manager_test.go
index ee0fc79802..783675dacb 100644
--- a/pkg/kubelet/images/image_gc_manager_test.go
+++ b/pkg/kubelet/images/image_gc_manager_test.go
@@ -33,7 +33,7 @@ import (
)
var zero time.Time
-var sandboxImage = "gcr.io/google_containers/pause-amd64:latest"
+var sandboxImage = "k8s.gcr.io/pause-amd64:latest"
func newRealImageGCManager(policy ImageGCPolicy) (*realImageGCManager, *containertest.FakeRuntime, *statstest.StatsProvider) {
fakeRuntime := &containertest.FakeRuntime{}
diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go
index 38636f70e1..79ee6e88e2 100644
--- a/pkg/kubelet/kubelet_node_status_test.go
+++ b/pkg/kubelet/kubelet_node_status_test.go
@@ -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, "gcr.io/google_containers:v"+strconv.Itoa(count))
+ tagList = append(tagList, "k8s.gcr.io: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{"gcr.io/google_containers:v3", "gcr.io/google_containers:v4"},
+ Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
SizeBytes: 456,
},
{
- Names: []string{"gcr.io/google_containers:v1", "gcr.io/google_containers:v2"},
+ Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"},
SizeBytes: 123,
},
},
@@ -680,11 +680,11 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
},
Images: []v1.ContainerImage{
{
- Names: []string{"gcr.io/google_containers:v3", "gcr.io/google_containers:v4"},
+ Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
SizeBytes: 456,
},
{
- Names: []string{"gcr.io/google_containers:v1", "gcr.io/google_containers:v2"},
+ Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"},
SizeBytes: 123,
},
},
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index 1b996c2d1a..18746c67d6 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -127,12 +127,12 @@ func newTestKubelet(t *testing.T, controllerAttachDetachEnabled bool) *TestKubel
imageList := []kubecontainer.Image{
{
ID: "abc",
- RepoTags: []string{"gcr.io/google_containers:v1", "gcr.io/google_containers:v2"},
+ RepoTags: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"},
Size: 123,
},
{
ID: "efg",
- RepoTags: []string{"gcr.io/google_containers:v3", "gcr.io/google_containers:v4"},
+ RepoTags: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"},
Size: 456,
},
}
diff --git a/pkg/volume/util/operationexecutor/operation_executor.go b/pkg/volume/util/operationexecutor/operation_executor.go
index 7df9f43d79..1d35438c30 100644
--- a/pkg/volume/util/operationexecutor/operation_executor.go
+++ b/pkg/volume/util/operationexecutor/operation_executor.go
@@ -453,7 +453,7 @@ type MountedVolume struct {
// name: test-pd
// spec:
// containers:
- // - image: gcr.io/google_containers/test-webserver
+ // - image: k8s.gcr.io/test-webserver
// name: test-container
// volumeMounts:
// - mountPath: /test-pd
@@ -491,7 +491,7 @@ type MountedVolume struct {
// name: test-pd
// spec:
// containers:
- // - image: gcr.io/google_containers/test-webserver
+ // - image: k8s.gcr.io/test-webserver
// name: test-container
// volumeMounts:
// - mountPath: /test-pd
diff --git a/pkg/volume/util/operationexecutor/operation_executor_test.go b/pkg/volume/util/operationexecutor/operation_executor_test.go
index 18e68a3ab0..6aabd54b1f 100644
--- a/pkg/volume/util/operationexecutor/operation_executor_test.go
+++ b/pkg/volume/util/operationexecutor/operation_executor_test.go
@@ -493,7 +493,7 @@ func getTestPodWithSecret(podName, secretName string) *v1.Pod {
Containers: []v1.Container{
{
Name: "secret-volume-test",
- Image: "gcr.io/google_containers/mounttest:0.8",
+ Image: "k8s.gcr.io/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: "gcr.io/google_containers/mounttest:0.8",
+ Image: "k8s.gcr.io/mounttest:0.8",
Args: []string{
"--file_content=/etc/pd-volume/data-1",
},
diff --git a/pkg/volume/util/util_test.go b/pkg/volume/util/util_test.go
index 5fd11f0861..6dcc125eb5 100644
--- a/pkg/volume/util/util_test.go
+++ b/pkg/volume/util/util_test.go
@@ -164,7 +164,7 @@ metadata:
name: testpod
spec:
containers:
- - image: gcr.io/google_containers/busybox
+ - image: k8s.gcr.io/busybox
`,
false,
},
@@ -181,7 +181,7 @@ spec:
"spec": {
"containers": [
{
- "image": "gcr.io/google_containers/busybox"
+ "image": "k8s.gcr.io/busybox"
}
]
}
@@ -197,7 +197,7 @@ kind: Pod
metadata:
name: testpod
spec:
- - image: gcr.io/google_containers/busybox
+ - image: k8s.gcr.io/busybox
`,
true,
},
diff --git a/pkg/volume/util_test.go b/pkg/volume/util_test.go
index 273722a0c3..011793defe 100644
--- a/pkg/volume/util_test.go
+++ b/pkg/volume/util_test.go
@@ -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 \"gcr.io/google_containers/busybox\""),
- newEvent(v1.EventTypeNormal, "Successfully pulled image \"gcr.io/google_containers/busybox\""),
+ newEvent(v1.EventTypeNormal, "pulling image \"k8s.gcr.io/busybox\""),
+ newEvent(v1.EventTypeNormal, "Successfully pulled image \"k8s.gcr.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, ""),
@@ -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 \"gcr.io/google_containers/busybox\""},
- {v1.EventTypeNormal, "Successfully pulled image \"gcr.io/google_containers/busybox\""},
+ {v1.EventTypeNormal, "pulling image \"k8s.gcr.io/busybox\""},
+ {v1.EventTypeNormal, "Successfully pulled image \"k8s.gcr.io/busybox\""},
{v1.EventTypeNormal, "Created container with docker id 83d929aeac82"},
{v1.EventTypeNormal, "Started container with docker id 83d929aeac82"},
},
diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto
index ad22fec198..e5d8f74db6 100644
--- a/staging/src/k8s.io/api/core/v1/generated.proto
+++ b/staging/src/k8s.io/api/core/v1/generated.proto
@@ -637,7 +637,7 @@ message Container {
// Describe a container image
message ContainerImage {
// Names by which this image is known.
- // e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]
+ // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]
repeated string names = 1;
// The size of the image in bytes.
diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go
index 01d5a0d828..d1b464fd40 100644
--- a/staging/src/k8s.io/api/core/v1/types.go
+++ b/staging/src/k8s.io/api/core/v1/types.go
@@ -3928,7 +3928,7 @@ type PodSignature struct {
// Describe a container image
type ContainerImage struct {
// Names by which this image is known.
- // e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]
+ // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]
Names []string `json:"names" protobuf:"bytes,1,rep,name=names"`
// The size of the image in bytes.
// +optional
diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go
index 860975f718..2c274b13d9 100644
--- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go
@@ -310,7 +310,7 @@ func (Container) SwaggerDoc() map[string]string {
var map_ContainerImage = map[string]string{
"": "Describe a container image",
- "names": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
+ "names": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
"sizeBytes": "The size of the image in bytes.",
}
diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go
index 60a545414d..20fd2a157d 100644
--- a/test/e2e/framework/nodes_util.go
+++ b/test/e2e/framework/nodes_util.go
@@ -83,7 +83,7 @@ func ingressUpgradeGCE(isUpgrade bool) error {
command = "sudo sed -i -re 's/(image:)(.*)/\\1 gcr.io\\/k8s-ingress-image-push\\/ingress-gce-e2e-glbc-amd64:latest/' /etc/kubernetes/manifests/glbc.manifest"
} else {
// Downgrade
- command = "sudo sed -i -re 's/(image:)(.*)/\\1 gcr.io\\/google_containers\\/glbc:0.9.7/' /etc/kubernetes/manifests/glbc.manifest"
+ command = "sudo sed -i -re 's/(image:)(.*)/\\1 k8s.gcr.io\\/glbc:0.9.7/' /etc/kubernetes/manifests/glbc.manifest"
}
sshResult, err := NodeExec(GetMasterHost(), command)
LogSSHResult(sshResult)
diff --git a/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go b/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go
index b6e861575e..f1d3e0926b 100644
--- a/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go
+++ b/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go
@@ -127,7 +127,7 @@ func StackdriverExporterPod(podName, namespace, podLabel, metricName string, met
func stackdriverExporterContainerSpec(name string, metricName string, metricValue int64) corev1.Container {
return corev1.Container{
Name: name,
- Image: "gcr.io/google-containers/sd-dummy-exporter:v0.1.0",
+ Image: "k8s.gcr.io/sd-dummy-exporter:v0.1.0",
ImagePullPolicy: corev1.PullPolicy("Always"),
Command: []string{"/sd_dummy_exporter", "--pod-id=$(POD_ID)", "--metric-name=" + metricName, fmt.Sprintf("--metric-value=%v", metricValue)},
Env: []corev1.EnvVar{
@@ -175,7 +175,7 @@ func prometheusExporterPodSpec(metricName string, metricValue int64, port int32)
Containers: []corev1.Container{
{
Name: "prometheus-exporter",
- Image: "gcr.io/google-containers/prometheus-dummy-exporter:v0.1.0",
+ Image: "k8s.gcr.io/prometheus-dummy-exporter:v0.1.0",
ImagePullPolicy: corev1.PullPolicy("Always"),
Command: []string{"/prometheus_dummy_exporter", "--metric-name=" + metricName,
fmt.Sprintf("--metric-value=%v", metricValue), fmt.Sprintf("=--port=%d", port)},
@@ -183,7 +183,7 @@ func prometheusExporterPodSpec(metricName string, metricValue int64, port int32)
},
{
Name: "prometheus-to-sd",
- Image: "gcr.io/google-containers/prometheus-to-sd:v0.2.3",
+ Image: "k8s.gcr.io/prometheus-to-sd:v0.2.3",
ImagePullPolicy: corev1.PullPolicy("Always"),
Command: []string{"/monitor", fmt.Sprintf("--source=:http://localhost:%d", port),
"--stackdriver-prefix=custom.googleapis.com", "--pod-id=$(POD_ID)", "--namespace-id=$(POD_NAMESPACE)"},
diff --git a/test/e2e/testing-manifests/ingress/http/rc.yaml b/test/e2e/testing-manifests/ingress/http/rc.yaml
index 9b7d3b624d..a4bcd5e395 100644
--- a/test/e2e/testing-manifests/ingress/http/rc.yaml
+++ b/test/e2e/testing-manifests/ingress/http/rc.yaml
@@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: echoheaders
- image: gcr.io/google_containers/echoserver:1.6
+ image: k8s.gcr.io/echoserver:1.6
ports:
- containerPort: 8080
readinessProbe:
diff --git a/test/e2e/testing-manifests/ingress/nginx/rc.yaml b/test/e2e/testing-manifests/ingress/nginx/rc.yaml
index 9d21ff5500..b80b0837a1 100644
--- a/test/e2e/testing-manifests/ingress/nginx/rc.yaml
+++ b/test/e2e/testing-manifests/ingress/nginx/rc.yaml
@@ -17,7 +17,7 @@ spec:
spec:
terminationGracePeriodSeconds: 0
containers:
- - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.1
+ - image: k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.1
livenessProbe:
httpGet:
path: /healthz
diff --git a/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml
index abf9b036ed..391ad67444 100644
--- a/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml
+++ b/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml
@@ -11,6 +11,6 @@ spec:
spec:
containers:
- name: echoheaders-https
- image: gcr.io/google_containers/echoserver:1.6
+ image: k8s.gcr.io/echoserver:1.6
ports:
- containerPort: 8080
diff --git a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml
index abf9b036ed..391ad67444 100644
--- a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml
+++ b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml
@@ -11,6 +11,6 @@ spec:
spec:
containers:
- name: echoheaders-https
- image: gcr.io/google_containers/echoserver:1.6
+ image: k8s.gcr.io/echoserver:1.6
ports:
- containerPort: 8080
diff --git a/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml
index 528aa25a12..b1ce4229cb 100644
--- a/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml
+++ b/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml
@@ -17,7 +17,7 @@ spec:
version: v1
spec:
containers:
- - image: gcr.io/google_containers/servicelb:0.1
+ - image: k8s.gcr.io/servicelb:0.1
imagePullPolicy: Always
livenessProbe:
httpGet:
diff --git a/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml
index c2aa34ca1f..f09c090d5b 100644
--- a/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml
+++ b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml
@@ -12,7 +12,7 @@ spec:
spec:
containers:
- name: netexec
- image: gcr.io/google_containers/netexec:1.4
+ image: k8s.gcr.io/netexec:1.4
ports:
- containerPort: 8080
# This is to force these pods to land on different hosts.
diff --git a/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml b/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml
index 65699f8e3c..8139cf5f99 100644
--- a/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml
+++ b/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml
@@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: test-server
- image: gcr.io/google-containers/cassandra-e2e-test:0.1
+ image: k8s.gcr.io/cassandra-e2e-test:0.1
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml b/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
index f1be16ff7c..f61574e8cf 100644
--- a/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: etcd
- image: gcr.io/google_containers/etcd-amd64:2.2.5
+ image: k8s.gcr.io/etcd-amd64:2.2.5
imagePullPolicy: Always
ports:
- containerPort: 2380
diff --git a/test/e2e/testing-manifests/statefulset/etcd/tester.yaml b/test/e2e/testing-manifests/statefulset/etcd/tester.yaml
index c5ea0b90c1..ee53bc1419 100644
--- a/test/e2e/testing-manifests/statefulset/etcd/tester.yaml
+++ b/test/e2e/testing-manifests/statefulset/etcd/tester.yaml
@@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: test-server
- image: gcr.io/google-containers/etcd-statefulset-e2e-test:0.0
+ image: k8s.gcr.io/etcd-statefulset-e2e-test:0.0
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml b/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml
index 85f4c080c6..20483ea454 100644
--- a/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml
@@ -12,7 +12,7 @@ spec:
spec:
initContainers:
- name: install
- image: gcr.io/google_containers/galera-install:0.1
+ image: k8s.gcr.io/galera-install:0.1
imagePullPolicy: Always
args:
- "--work-dir=/work-dir"
@@ -41,7 +41,7 @@ spec:
mountPath: "/etc/mysql"
containers:
- name: mysql
- image: gcr.io/google_containers/mysql-galera:e2e
+ image: k8s.gcr.io/mysql-galera:e2e
ports:
- containerPort: 3306
name: mysql
@@ -55,7 +55,7 @@ spec:
- --defaults-file=/etc/mysql/my-galera.cnf
- --user=root
readinessProbe:
- # TODO: If docker exec is buggy just use gcr.io/google_containers/mysql-healthz:1.0
+ # TODO: If docker exec is buggy just use k8s.gcr.io/mysql-healthz:1.0
exec:
command:
- sh
diff --git a/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml b/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml
index c7e7ff8d4f..3a60b3473a 100644
--- a/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml
+++ b/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml
@@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: test-server
- image: gcr.io/google-containers/mysql-e2e-test:0.1
+ image: k8s.gcr.io/mysql-e2e-test:0.1
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml b/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml
index a483fd5dd3..0436fe25ba 100644
--- a/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml
@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: nginx
- image: gcr.io/google_containers/nginx-slim:0.8
+ image: k8s.gcr.io/nginx-slim:0.8
ports:
- containerPort: 80
name: web
@@ -31,4 +31,4 @@ spec:
accessModes: [ "ReadWriteOnce" ]
resources:
requests:
- storage: 1Gi
\ No newline at end of file
+ storage: 1Gi
diff --git a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
index e5ed3a798b..85c6b497ac 100644
--- a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
@@ -12,7 +12,7 @@ spec:
spec:
initContainers:
- name: install
- image: gcr.io/google_containers/redis-install-3.2.0:e2e
+ image: k8s.gcr.io/redis-install-3.2.0:e2e
imagePullPolicy: Always
args:
- "--install-into=/opt"
diff --git a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
index 62c534cddc..d08e62800e 100644
--- a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
@@ -12,7 +12,7 @@ spec:
spec:
initContainers:
- name: install
- image: gcr.io/google_containers/zookeeper-install-3.5.0-alpha:e2e
+ image: k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e
imagePullPolicy: Always
args:
- "--install-into=/opt"
diff --git a/test/e2e_node/conformance/build/Makefile b/test/e2e_node/conformance/build/Makefile
index abc03366bc..20d74356af 100644
--- a/test/e2e_node/conformance/build/Makefile
+++ b/test/e2e_node/conformance/build/Makefile
@@ -15,7 +15,7 @@
# Build the node-test image.
#
# Usage:
-# [ARCH=amd64] [REGISTRY="gcr.io/google_containers"] [BIN_DIR="../../../../_output/bin"] make (build|push) VERSION={some_version_number e.g. 0.1}
+# [ARCH=amd64] [REGISTRY="staging-k8s.gcr.io"] [BIN_DIR="../../../../_output/bin"] make (build|push) VERSION={some_version_number e.g. 0.1}
# SYSTEM_SPEC_NAME is the name of the system spec used for the node conformance
# test. The specs are expected to be in SYSTEM_SPEC_DIR.
@@ -23,7 +23,7 @@ SYSTEM_SPEC_NAME?=
SYSTEM_SPEC_DIR?=../../system/specs
# TODO(random-liu): Add this into release progress.
-REGISTRY?=gcr.io/google_containers
+REGISTRY?=staging-k8s.gcr.io
ARCH?=amd64
# BIN_DIR is the directory to find binaries, overwrite with ../../../../_output/bin
# for local development.
diff --git a/test/e2e_node/conformance/run_test.sh b/test/e2e_node/conformance/run_test.sh
index af9f2febc8..6ddb247883 100755
--- a/test/e2e_node/conformance/run_test.sh
+++ b/test/e2e_node/conformance/run_test.sh
@@ -44,7 +44,7 @@ SKIP=${SKIP:-""}
TEST_ARGS=${TEST_ARGS:-""}
# REGISTRY is the image registry for node test image.
-REGISTRY=${REGISTRY:-"gcr.io/google_containers"}
+REGISTRY=${REGISTRY:-"k8s.gcr.io"}
# ARCH is the architecture of current machine, the script will use this to
# select corresponding test container image.
diff --git a/test/e2e_node/gke_environment_test.go b/test/e2e_node/gke_environment_test.go
index ee1ddafd4e..dd88976b39 100644
--- a/test/e2e_node/gke_environment_test.go
+++ b/test/e2e_node/gke_environment_test.go
@@ -84,7 +84,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 = "gcr.io/google-containers/busybox"
+ const image = "k8s.gcr.io/busybox"
output, err := runCommand("docker", "images", "-q", image)
if len(output) != 0 {
if _, err := runCommand("docker", "rmi", "-f", image); err != nil {
@@ -170,7 +170,7 @@ func checkDockerConfig() error {
// checkDockerNetworkClient checks client networking by pinging an external IP
// address from a container.
func checkDockerNetworkClient() error {
- const imageName = "gcr.io/google-containers/busybox"
+ const imageName = "k8s.gcr.io/busybox"
output, err := runCommand("docker", "run", "--rm", imageName, "sh", "-c", "ping -w 5 -q google.com")
if err != nil {
return err
@@ -185,7 +185,7 @@ func checkDockerNetworkClient() error {
// within a container and accessing it from outside.
func checkDockerNetworkServer() error {
const (
- imageName = "gcr.io/google-containers/nginx:1.7.9"
+ imageName = "k8s.gcr.io/nginx:1.7.9"
hostAddr = "127.0.0.1"
hostPort = "8088"
containerPort = "80"
diff --git a/test/e2e_node/image_id_test.go b/test/e2e_node/image_id_test.go
index a131c398b8..090eafa286 100644
--- a/test/e2e_node/image_id_test.go
+++ b/test/e2e_node/image_id_test.go
@@ -28,7 +28,7 @@ import (
var _ = framework.KubeDescribe("ImageID", func() {
- busyBoxImage := "gcr.io/google_containers/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff"
+ busyBoxImage := "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff"
f := framework.NewDefaultFramework("image-id-test")
diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go
index bd55bf59e8..00a35955a7 100644
--- a/test/e2e_node/image_list.go
+++ b/test/e2e_node/image_list.go
@@ -43,10 +43,10 @@ const (
// before test running so that the image pulling won't fail in actual test.
var NodeImageWhiteList = sets.NewString(
"google/cadvisor:latest",
- "gcr.io/google-containers/stress:v1",
+ "k8s.gcr.io/stress:v1",
busyboxImage,
- "gcr.io/google_containers/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
- "gcr.io/google_containers/node-problem-detector:v0.4.1",
+ "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
+ "k8s.gcr.io/node-problem-detector:v0.4.1",
imageutils.GetE2EImage(imageutils.NginxSlim),
imageutils.GetE2EImage(imageutils.ServeHostname),
imageutils.GetE2EImage(imageutils.Netexec),
diff --git a/test/e2e_node/jenkins/gci-init-gpu.yaml b/test/e2e_node/jenkins/gci-init-gpu.yaml
index 064b77095c..3b943de33f 100644
--- a/test/e2e_node/jenkins/gci-init-gpu.yaml
+++ b/test/e2e_node/jenkins/gci-init-gpu.yaml
@@ -2,7 +2,7 @@
runcmd:
- modprobe configs
- - docker run -v /dev:/dev -v /home/kubernetes/bin/nvidia:/rootfs/nvidia -v /etc/os-release:/rootfs/etc/os-release -v /proc/sysrq-trigger:/sysrq -e BASE_DIR=/rootfs/nvidia --privileged gcr.io/google_containers/cos-nvidia-driver-install@sha256:cb55c7971c337fece62f2bfe858662522a01e43ac9984a2dd1dd5c71487d225c
+ - docker run -v /dev:/dev -v /home/kubernetes/bin/nvidia:/rootfs/nvidia -v /etc/os-release:/rootfs/etc/os-release -v /proc/sysrq-trigger:/sysrq -e BASE_DIR=/rootfs/nvidia --privileged k8s.gcr.io/cos-nvidia-driver-install@sha256:cb55c7971c337fece62f2bfe858662522a01e43ac9984a2dd1dd5c71487d225c
- mount /tmp /tmp -o remount,exec,suid
- usermod -a -G docker jenkins
- mkdir -p /var/lib/kubelet
diff --git a/test/e2e_node/node_problem_detector_linux.go b/test/e2e_node/node_problem_detector_linux.go
index 3c9b6453ec..9333b66cba 100644
--- a/test/e2e_node/node_problem_detector_linux.go
+++ b/test/e2e_node/node_problem_detector_linux.go
@@ -45,7 +45,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
pollInterval = 1 * time.Second
pollConsistent = 5 * time.Second
pollTimeout = 1 * time.Minute
- image = "gcr.io/google_containers/node-problem-detector:v0.4.1"
+ image = "k8s.gcr.io/node-problem-detector:v0.4.1"
)
f := framework.NewDefaultFramework("node-problem-detector")
var c clientset.Interface
diff --git a/test/e2e_node/remote/node_conformance.go b/test/e2e_node/remote/node_conformance.go
index 59e322a77b..625940bf19 100644
--- a/test/e2e_node/remote/node_conformance.go
+++ b/test/e2e_node/remote/node_conformance.go
@@ -53,7 +53,7 @@ func commandToString(c *exec.Cmd) string {
// Image path constants.
const (
- conformanceRegistry = "gcr.io/google_containers"
+ conformanceRegistry = "k8s.gcr.io"
conformanceArch = runtime.GOARCH
conformanceTarfile = "node_conformance.tar"
conformanceTestBinary = "e2e_node.test"
diff --git a/test/e2e_node/runtime_conformance_test.go b/test/e2e_node/runtime_conformance_test.go
index a616dd9b1e..0a8b7ac57d 100644
--- a/test/e2e_node/runtime_conformance_test.go
+++ b/test/e2e_node/runtime_conformance_test.go
@@ -275,13 +275,13 @@ while true; do sleep 1; done
},
{
description: "should not be able to pull non-existing image from gcr.io",
- image: "gcr.io/google_containers/invalid-image:invalid-tag",
+ image: "k8s.gcr.io/invalid-image:invalid-tag",
phase: v1.PodPending,
waiting: true,
},
{
description: "should be able to pull image from gcr.io",
- image: "gcr.io/google_containers/alpine-with-bash:1.0",
+ image: "k8s.gcr.io/alpine-with-bash:1.0",
phase: v1.PodRunning,
waiting: false,
},
diff --git a/test/fixtures/doc-yaml/admin/high-availability/etcd.yaml b/test/fixtures/doc-yaml/admin/high-availability/etcd.yaml
index 3c73984ba9..d9f2b8e64d 100644
--- a/test/fixtures/doc-yaml/admin/high-availability/etcd.yaml
+++ b/test/fixtures/doc-yaml/admin/high-availability/etcd.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
hostNetwork: true
containers:
- - image: gcr.io/google_containers/etcd:2.0.9
+ - image: k8s.gcr.io/etcd:2.0.9
name: etcd-container
command:
- /usr/local/bin/etcd
diff --git a/test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml b/test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml
index a41a2c666d..a415ebc19d 100644
--- a/test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml
+++ b/test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml
@@ -6,7 +6,7 @@ spec:
hostNetwork: true
containers:
- name: kube-apiserver
- image: gcr.io/google_containers/kube-apiserver:9680e782e08a1a1c94c656190011bd02
+ image: k8s.gcr.io/kube-apiserver:9680e782e08a1a1c94c656190011bd02
command:
- /bin/sh
- -c
diff --git a/test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml b/test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml
index a7cfbd5785..7985192978 100644
--- a/test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml
+++ b/test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml
@@ -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: gcr.io/google_containers/kube-controller-manager:fda24638d51a48baa13c35337fcd4793
+ image: k8s.gcr.io/kube-controller-manager:fda24638d51a48baa13c35337fcd4793
livenessProbe:
httpGet:
path: /healthz
diff --git a/test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml b/test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml
index eeef9bb628..1da3091859 100644
--- a/test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml
+++ b/test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml
@@ -6,7 +6,7 @@ spec:
hostNetwork: true
containers:
- name: kube-scheduler
- image: gcr.io/google_containers/kube-scheduler:34d0b8f8b31e27937327961528739bc9
+ image: k8s.gcr.io/kube-scheduler:34d0b8f8b31e27937327961528739bc9
command:
- /bin/sh
- -c
diff --git a/test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml b/test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml
index b63f25deba..ecb45dd95f 100644
--- a/test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml
+++ b/test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: kubernetes-serve-hostname
- image: gcr.io/google_containers/serve_hostname
+ image: k8s.gcr.io/serve_hostname
resources:
limits:
cpu: "3"
diff --git a/test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml b/test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml
index c1ec54183b..d83e91267a 100644
--- a/test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml
+++ b/test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml
@@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: kubernetes-serve-hostname
- image: gcr.io/google_containers/serve_hostname
+ image: k8s.gcr.io/serve_hostname
resources:
limits:
cpu: "1"
diff --git a/test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml b/test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml
index a4796fc24c..6414555355 100644
--- a/test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml
+++ b/test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
- image: gcr.io/google_containers/busybox
+ image: k8s.gcr.io/busybox
command: [ "/bin/sh", "-c", "env" ]
env:
- name: MY_POD_NAME
diff --git a/test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml b/test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml
index 461691df22..204c4ddf59 100644
--- a/test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml
+++ b/test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml
@@ -10,7 +10,7 @@ spec:
- /bin/sh
- -c
- echo ok > /tmp/health; sleep 10; rm -rf /tmp/health; sleep 600
- image: gcr.io/google_containers/busybox
+ image: k8s.gcr.io/busybox
livenessProbe:
exec:
command:
diff --git a/test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml b/test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml
index e7196c6559..1a6ef7bc64 100644
--- a/test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml
+++ b/test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml
@@ -8,7 +8,7 @@ spec:
containers:
- args:
- /server
- image: gcr.io/google_containers/liveness
+ image: k8s.gcr.io/liveness
livenessProbe:
httpGet:
path: /healthz
diff --git a/test/fixtures/doc-yaml/user-guide/multi-pod.yaml b/test/fixtures/doc-yaml/user-guide/multi-pod.yaml
index 1a1d758e99..c795ce6f4d 100644
--- a/test/fixtures/doc-yaml/user-guide/multi-pod.yaml
+++ b/test/fixtures/doc-yaml/user-guide/multi-pod.yaml
@@ -42,7 +42,7 @@ metadata:
spec:
containers:
- name: kubernetes-serve-hostname
- image: gcr.io/google_containers/serve_hostname
+ image: k8s.gcr.io/serve_hostname
resources:
limits:
cpu: "1"
diff --git a/test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml b/test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml
index a5d9c0ff75..d93d4095e1 100644
--- a/test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml
+++ b/test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
- image: gcr.io/google_containers/busybox
+ image: k8s.gcr.io/busybox
command: [ "/bin/sh", "-c", "env" ]
env:
- name: MY_SECRET_DATA
diff --git a/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml b/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml
index 8f87a8dea5..1ff2e8652f 100644
--- a/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml
+++ b/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
- image: gcr.io/google_containers/mounttest:0.8
+ image: k8s.gcr.io/mounttest:0.8
command: [ "/mt", "--file_content=/etc/secret-volume/data-1" ]
volumeMounts:
# name must match the volume name below
diff --git a/test/fixtures/pkg/kubectl/builder/kitten-rc.yaml b/test/fixtures/pkg/kubectl/builder/kitten-rc.yaml
index 91f1aa06c3..48b15cc190 100644
--- a/test/fixtures/pkg/kubectl/builder/kitten-rc.yaml
+++ b/test/fixtures/pkg/kubectl/builder/kitten-rc.yaml
@@ -13,7 +13,7 @@ spec:
version: kitten
spec:
containers:
- - image: gcr.io/google_containers/update-demo:kitten
+ - image: k8s.gcr.io/update-demo:kitten
name: update-demo
ports:
- containerPort: 80
diff --git a/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml b/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml
index c358d8aa28..958e054ec5 100644
--- a/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml
+++ b/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml
@@ -30,7 +30,7 @@ items:
spec:
containers:
- name: kubernetes-serve-hostname
- image: gcr.io/google_containers/serve_hostname
+ image: k8s.gcr.io/serve_hostname
resources:
limits:
cpu: "1"
diff --git a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml
index 35b388c7a9..4c1c6f244f 100644
--- a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml
+++ b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml
@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: mock-container
- image: gcr.io/google-containers/pause:2.0
+ image: k8s.gcr.io/pause:2.0
---
apiVersion: v1
kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: mock-container
- image: gcr.io/google-containers/pause:2.0
\ No newline at end of file
+ image: k8s.gcr.io/pause:2.0
diff --git a/test/images/iperf/BASEIMAGE b/test/images/iperf/BASEIMAGE
index 1bf3907f76..7f7f90c89a 100644
--- a/test/images/iperf/BASEIMAGE
+++ b/test/images/iperf/BASEIMAGE
@@ -1,4 +1,4 @@
-amd64=gcr.io/google_containers/ubuntu-slim:0.12
-arm=gcr.io/google_containers/ubuntu-slim-arm:0.12
-arm64=gcr.io/google_containers/ubuntu-slim-arm64:0.12
-ppc64le=gcr.io/google_containers/ubuntu-slim-ppc64le:0.12
+amd64=k8s.gcr.io/ubuntu-slim:0.12
+arm=k8s.gcr.io/ubuntu-slim-arm:0.12
+arm64=k8s.gcr.io/ubuntu-slim-arm64:0.12
+ppc64le=k8s.gcr.io/ubuntu-slim-ppc64le:0.12
diff --git a/test/images/logs-generator/README.md b/test/images/logs-generator/README.md
index 8f89bb4a4b..889ba2a7bd 100644
--- a/test/images/logs-generator/README.md
+++ b/test/images/logs-generator/README.md
@@ -33,7 +33,7 @@ line in a given run of the container.
Image is located in the public repository of Google Container Registry under the name
```
-gcr.io/google_containers/logs-generator:v0.1.1
+k8s.gcr.io/logs-generator:v0.1.1
```
## Examples
@@ -42,13 +42,13 @@ gcr.io/google_containers/logs-generator:v0.1.1
docker run -i \
-e "LOGS_GENERATOR_LINES_TOTAL=10" \
-e "LOGS_GENERATOR_DURATION=1s" \
- gcr.io/google_containers/logs-generator:v0.1.1
+ k8s.gcr.io/logs-generator:v0.1.1
```
```
kubectl run logs-generator \
--generator=run-pod/v1 \
- --image=gcr.io/google_containers/logs-generator:v0.1.1 \
+ --image=k8s.gcr.io/logs-generator:v0.1.1 \
--restart=Never \
--env "LOGS_GENERATOR_LINES_TOTAL=1000" \
--env "LOGS_GENERATOR_DURATION=1m"
diff --git a/test/images/pets/peer-finder/BASEIMAGE b/test/images/pets/peer-finder/BASEIMAGE
index 425fce2600..0b04ef6e4d 100644
--- a/test/images/pets/peer-finder/BASEIMAGE
+++ b/test/images/pets/peer-finder/BASEIMAGE
@@ -1,4 +1,4 @@
-amd64=gcr.io/google-containers/debian-base-amd64:0.3
-arm=gcr.io/google-containers/debian-base-arm:0.3
-arm64=gcr.io/google-containers/debian-base-arm64:0.3
-ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
+amd64=k8s.gcr.io/debian-base-amd64:0.3
+arm=k8s.gcr.io/debian-base-arm:0.3
+arm64=k8s.gcr.io/debian-base-arm64:0.3
+ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3
diff --git a/test/images/pets/redis-installer/BASEIMAGE b/test/images/pets/redis-installer/BASEIMAGE
index 425fce2600..0b04ef6e4d 100644
--- a/test/images/pets/redis-installer/BASEIMAGE
+++ b/test/images/pets/redis-installer/BASEIMAGE
@@ -1,4 +1,4 @@
-amd64=gcr.io/google-containers/debian-base-amd64:0.3
-arm=gcr.io/google-containers/debian-base-arm:0.3
-arm64=gcr.io/google-containers/debian-base-arm64:0.3
-ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
+amd64=k8s.gcr.io/debian-base-amd64:0.3
+arm=k8s.gcr.io/debian-base-arm:0.3
+arm64=k8s.gcr.io/debian-base-arm64:0.3
+ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3
diff --git a/test/images/pets/redis-installer/README.md b/test/images/pets/redis-installer/README.md
index 04024c1359..e1c3587af3 100644
--- a/test/images/pets/redis-installer/README.md
+++ b/test/images/pets/redis-installer/README.md
@@ -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 gcr.io/google_containers/redis-install-3.2.0:e2e --cmd --install-into=/opt --work-dir=/work-dir
+$ docker run -it k8s.gcr.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.
diff --git a/test/images/pets/zookeeper-installer/BASEIMAGE b/test/images/pets/zookeeper-installer/BASEIMAGE
index 425fce2600..0b04ef6e4d 100644
--- a/test/images/pets/zookeeper-installer/BASEIMAGE
+++ b/test/images/pets/zookeeper-installer/BASEIMAGE
@@ -1,4 +1,4 @@
-amd64=gcr.io/google-containers/debian-base-amd64:0.3
-arm=gcr.io/google-containers/debian-base-arm:0.3
-arm64=gcr.io/google-containers/debian-base-arm64:0.3
-ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
+amd64=k8s.gcr.io/debian-base-amd64:0.3
+arm=k8s.gcr.io/debian-base-arm:0.3
+arm64=k8s.gcr.io/debian-base-arm64:0.3
+ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3
diff --git a/test/images/pets/zookeeper-installer/README.md b/test/images/pets/zookeeper-installer/README.md
index 071bc7aa48..598ca7afe9 100644
--- a/test/images/pets/zookeeper-installer/README.md
+++ b/test/images/pets/zookeeper-installer/README.md
@@ -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 gcr.io/google_containers/zookeeper-install-3.5.0-alpha:e2e --cmd --install-into=/opt --work-dir=/work-dir
+$ docker run -it k8s.gcr.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.
diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE
index 425fce2600..0b04ef6e4d 100644
--- a/test/images/resource-consumer/BASEIMAGE
+++ b/test/images/resource-consumer/BASEIMAGE
@@ -1,4 +1,4 @@
-amd64=gcr.io/google-containers/debian-base-amd64:0.3
-arm=gcr.io/google-containers/debian-base-arm:0.3
-arm64=gcr.io/google-containers/debian-base-arm64:0.3
-ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
+amd64=k8s.gcr.io/debian-base-amd64:0.3
+arm=k8s.gcr.io/debian-base-arm:0.3
+arm64=k8s.gcr.io/debian-base-arm64:0.3
+ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3
diff --git a/test/images/resource-consumer/README.md b/test/images/resource-consumer/README.md
index 19801af8e3..742bafee36 100644
--- a/test/images/resource-consumer/README.md
+++ b/test/images/resource-consumer/README.md
@@ -48,7 +48,7 @@ Custom metrics in Prometheus format are exposed on "/metrics" endpoint.
###CURL example
```console
-$ kubectl run resource-consumer --image=gcr.io/google_containers/resource_consumer:beta --expose --service-overrides='{ "spec": { "type": "LoadBalancer" } }' --port 8080
+$ kubectl run resource-consumer --image=k8s.gcr.io/resource_consumer:beta --expose --service-overrides='{ "spec": { "type": "LoadBalancer" } }' --port 8080
$ kubectl get services resource-consumer
```
@@ -62,7 +62,7 @@ $ curl --data "millicores=300&durationSec=600" http://:8080/Consume
## Image
-Docker image of Resource Consumer can be found in Google Container Registry as gcr.io/google_containers/resource_consumer:beta
+Docker image of Resource Consumer can be found in Google Container Registry as k8s.gcr.io/resource_consumer:beta
## Use cases
diff --git a/test/images/serve-hostname/README.md b/test/images/serve-hostname/README.md
index 28d3733664..a4647ff95f 100644
--- a/test/images/serve-hostname/README.md
+++ b/test/images/serve-hostname/README.md
@@ -15,19 +15,19 @@ $ make all-push
# Build for linux/amd64 (default)
$ make push ARCH=amd64
-# ---> gcr.io/google_containers/serve_hostname-amd64:TAG
+# ---> staging-k8s.gcr.io/serve_hostname-amd64:TAG
$ make push ARCH=arm
-# ---> gcr.io/google_containers/serve_hostname-arm:TAG
+# ---> staging-k8s.gcr.io/serve_hostname-arm:TAG
$ make push ARCH=arm64
-# ---> gcr.io/google_containers/serve_hostname-arm64:TAG
+# ---> staging-k8s.gcr.io/serve_hostname-arm64:TAG
$ make push ARCH=ppc64le
-# ---> gcr.io/google_containers/serve_hostname-ppc64le:TAG
+# ---> staging-k8s.gcr.io/serve_hostname-ppc64le:TAG
$ make push ARCH=s390x
-# ---> gcr.io/google_containers/serve_hostname-s390x:TAG
+# ---> staging-k8s.gcr.io/serve_hostname-s390x:TAG
```
Of course, if you don't want to push the images, run `make all-container` or `make container ARCH={target_arch}` instead.
diff --git a/test/images/volumes-tester/ceph/Makefile b/test/images/volumes-tester/ceph/Makefile
index 2883aafb64..96c9bdbd40 100644
--- a/test/images/volumes-tester/ceph/Makefile
+++ b/test/images/volumes-tester/ceph/Makefile
@@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.1
-PREFIX = gcr.io/google_containers
+PREFIX = staging-k8s.gcr.io
all: push
diff --git a/test/images/volumes-tester/gluster/Makefile b/test/images/volumes-tester/gluster/Makefile
index 4aa5b11351..c4b1654e4f 100644
--- a/test/images/volumes-tester/gluster/Makefile
+++ b/test/images/volumes-tester/gluster/Makefile
@@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.4
-PREFIX = gcr.io/google_containers
+PREFIX = staging-k8s.gcr.io
all: push
diff --git a/test/images/volumes-tester/iscsi/Makefile b/test/images/volumes-tester/iscsi/Makefile
index dd830d4fd2..df13471923 100644
--- a/test/images/volumes-tester/iscsi/Makefile
+++ b/test/images/volumes-tester/iscsi/Makefile
@@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.1
-PREFIX = gcr.io/google_containers
+PREFIX = staging-k8s.gcr.io
all: push
diff --git a/test/images/volumes-tester/nfs/Makefile b/test/images/volumes-tester/nfs/Makefile
index 1e53b19c8b..1c1fc322e2 100644
--- a/test/images/volumes-tester/nfs/Makefile
+++ b/test/images/volumes-tester/nfs/Makefile
@@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.8
-PREFIX = gcr.io/google_containers
+PREFIX = staging-k8s.gcr.io
all: push
diff --git a/test/images/volumes-tester/rbd/Makefile b/test/images/volumes-tester/rbd/Makefile
index dcf3c69f37..27c67f47e2 100644
--- a/test/images/volumes-tester/rbd/Makefile
+++ b/test/images/volumes-tester/rbd/Makefile
@@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.1
-PREFIX = gcr.io/google_containers
+PREFIX = staging-k8s.gcr.io
all: push
diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json
index 47ac4ae0cd..4cce2217eb 100644
--- a/test/integration/benchmark-controller.json
+++ b/test/integration/benchmark-controller.json
@@ -17,7 +17,7 @@
"spec": {
"containers": [{
"name": "test-container",
- "image": "gcr.io/google_containers/pause-amd64:3.1"
+ "image": "k8s.gcr.io/pause-amd64:3.1"
}]
}
}
diff --git a/test/integration/framework/util.go b/test/integration/framework/util.go
index c9d42a99c4..8fbb57de4b 100644
--- a/test/integration/framework/util.go
+++ b/test/integration/framework/util.go
@@ -31,7 +31,7 @@ import (
const (
// When these values are updated, also update cmd/kubelet/app/options/container_runtime.go
// A copy of these values exist in test/utils/image/manifest.go
- currentPodInfraContainerImageName = "gcr.io/google_containers/pause"
+ currentPodInfraContainerImageName = "k8s.gcr.io/pause"
currentPodInfraContainerImageVersion = "3.1"
)
diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/master/synthetic_master_test.go
index d00f8766b2..aa063be5d2 100644
--- a/test/integration/master/synthetic_master_test.go
+++ b/test/integration/master/synthetic_master_test.go
@@ -279,7 +279,7 @@ var deploymentExtensions string = `
"spec": {
"containers": [{
"name": "nginx",
- "image": "gcr.io/google-containers/nginx:1.7.9"
+ "image": "k8s.gcr.io/nginx:1.7.9"
}]
}
}
@@ -306,7 +306,7 @@ var deploymentApps string = `
"spec": {
"containers": [{
"name": "nginx",
- "image": "gcr.io/google-containers/nginx:1.7.9"
+ "image": "k8s.gcr.io/nginx:1.7.9"
}]
}
}
diff --git a/test/integration/scheduler/volume_binding_test.go b/test/integration/scheduler/volume_binding_test.go
index 35f60f8102..de733fd248 100644
--- a/test/integration/scheduler/volume_binding_test.go
+++ b/test/integration/scheduler/volume_binding_test.go
@@ -324,7 +324,7 @@ func makePod(name, ns string, pvcs []string) *v1.Pod {
Containers: []v1.Container{
{
Name: "write-pod",
- Image: "gcr.io/google_containers/busybox:1.24",
+ Image: "k8s.gcr.io/busybox:1.24",
Command: []string{"/bin/sh"},
Args: []string{"-c", "while true; do sleep 1; done"},
},
diff --git a/test/kubemark/resources/cluster-autoscaler_template.json b/test/kubemark/resources/cluster-autoscaler_template.json
index f42c060e25..ffe4a61f8b 100644
--- a/test/kubemark/resources/cluster-autoscaler_template.json
+++ b/test/kubemark/resources/cluster-autoscaler_template.json
@@ -14,7 +14,7 @@
"containers": [
{
"name": "cluster-autoscaler",
- "image": "gcr.io/google_containers/cluster-autoscaler:v1.0.0",
+ "image": "k8s.gcr.io/cluster-autoscaler:v1.0.0",
"command": [
"./run.sh",
"--kubernetes=https://{{master_ip}}:443?inClusterConfig=0&useServiceAccount=0&auth=/kubeconfig/cluster_autoscaler.kubeconfig",
diff --git a/test/kubemark/resources/heapster_template.json b/test/kubemark/resources/heapster_template.json
index 491596b2ff..5a9bb512ea 100644
--- a/test/kubemark/resources/heapster_template.json
+++ b/test/kubemark/resources/heapster_template.json
@@ -33,7 +33,7 @@
"containers": [
{
"name": "heapster",
- "image": "gcr.io/google_containers/heapster:v1.3.0",
+ "image": "k8s.gcr.io/heapster:v1.3.0",
"resources": {
"requests": {
"cpu": "{{METRICS_CPU}}m",
@@ -55,7 +55,7 @@
},
{
"name": "eventer",
- "image": "gcr.io/google_containers/heapster:v1.3.0",
+ "image": "k8s.gcr.io/heapster:v1.3.0",
"resources": {
"requests": {
"memory": "{{EVENTER_MEM}}Ki"
diff --git a/test/kubemark/resources/hollow-node_template.yaml b/test/kubemark/resources/hollow-node_template.yaml
index 06352442c0..3a16f1f353 100644
--- a/test/kubemark/resources/hollow-node_template.yaml
+++ b/test/kubemark/resources/hollow-node_template.yaml
@@ -93,7 +93,7 @@ spec:
cpu: {{HOLLOW_PROXY_CPU}}m
memory: {{HOLLOW_PROXY_MEM}}Ki
- name: hollow-node-problem-detector
- image: gcr.io/google_containers/node-problem-detector:v0.4.1
+ image: k8s.gcr.io/node-problem-detector:v0.4.1
env:
- name: NODE_NAME
valueFrom:
diff --git a/test/kubemark/resources/start-kubemark-master.sh b/test/kubemark/resources/start-kubemark-master.sh
index b8d3c8d0ab..fd2b900f09 100755
--- a/test/kubemark/resources/start-kubemark-master.sh
+++ b/test/kubemark/resources/start-kubemark-master.sh
@@ -695,7 +695,7 @@ fi
# Setup docker flags and load images of the master components.
assemble-docker-flags
-DOCKER_REGISTRY="gcr.io/google_containers"
+DOCKER_REGISTRY="k8s.gcr.io"
load-docker-images
readonly audit_policy_file="/etc/audit_policy.config"
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 5d792c8e8d..6d8ed41afb 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -193,14 +193,14 @@ function create-and-upload-hollow-node-image {
echo 'Cannot find cmd/kubemark binary'
exit 1
fi
-
+
echo "Copying kubemark binary to ${MAKE_DIR}"
cp "${KUBEMARK_BIN}" "${MAKE_DIR}"
CURR_DIR=`pwd`
cd "${MAKE_DIR}"
RETRIES=3
for attempt in $(seq 1 ${RETRIES}); do
- if ! REGISTRY="${CONTAINER_REGISTRY}" PROJECT="${PROJECT}" make "${KUBEMARK_IMAGE_MAKE_TARGET}"; then
+ if ! REGISTRY="${FULL_REGISTRY}" make "${KUBEMARK_IMAGE_MAKE_TARGET}"; then
if [[ $((attempt)) -eq "${RETRIES}" ]]; then
echo "${color_red}Make failed. Exiting.${color_norm}"
exit 1
@@ -221,7 +221,7 @@ function create-and-upload-hollow-node-image {
function create-and-upload-hollow-node-image-bazel {
RETRIES=3
for attempt in $(seq 1 ${RETRIES}); do
- if ! bazel run //cluster/images/kubemark:push --define PROJECT="${PROJECT}"; then
+ if ! bazel run //cluster/images/kubemark:push --define REGISTRY="${FULL_REGISTRY}"; then
if [[ $((attempt)) -eq "${RETRIES}" ]]; then
echo "${color_red}Image push failed. Exiting.${color_norm}"
exit 1
@@ -457,6 +457,15 @@ write-local-kubeconfig
copy-resource-files-to-master
start-master-components
+# TODO: Simplify. The caller should have to pass a full registry or nothing.
+if [[ -n "${CONTAINER_REGISTRY}" && -n "${PROJECT}" ]]; then
+ FULL_REGISTRY="${CONTAINER_REGISTRY}/${PROJECT}"
+elif [[ -n "${CONTAINER_REGISTRY}" ]]; then
+ FULL_REGISTRY="${CONTAINER_REGISTRY}"
+else
+ FULL_REGISTRY=staging-k8s.gcr.io
+fi
+
# Setup for hollow-nodes.
echo ""
echo -e "${color_yellow}STARTING SETUP FOR HOLLOW-NODES${color_norm}"
diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index 947132c3cc..85b0e5fd5d 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -23,7 +23,7 @@ import (
const (
e2eRegistry = "gcr.io/kubernetes-e2e-test-images"
- gcRegistry = "gcr.io/google-containers"
+ gcRegistry = "k8s.gcr.io"
PrivateRegistry = "gcr.io/k8s-authenticated-test"
sampleRegistry = "gcr.io/google-samples"
)