Convert registry to k8s.gcr.io

2017-12-22 09:55:16 -08:00
parent f1c4a425e4
commit 8f196b7d6a
109 changed files with 180 additions and 180 deletions
@@ -86,7 +86,7 @@ For example:
 ```yaml
  containers:
  - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.16
+    image: k8s.gcr.io/fluentd-gcp:1.16
    resources:
      limits:
        cpu: 100m
@@ -87,9 +87,9 @@ images or you can build them yourself from HEAD.
 ### Using official release images

 As part of every Kubernetes release, official release images are pushed to
-`gcr.io/google_containers`. To use the images in this repository, you can
+`k8s.gcr.io`. To use the images in this repository, you can
 set the container image fields in the following configs to point to the
-images in this repository. `gcr.io/google_containers/hyperkube` image
+images in this repository. `k8s.gcr.io/hyperkube` image
 includes the federation-apiserver and federation-controller-manager
 binaries, so you can point the corresponding configs for those components
 to the hyperkube image.
@@ -315,8 +315,8 @@ official release images or you can build from HEAD.

 #### Using official release images

-As part of every release, images are pushed to `gcr.io/google_containers`. To use
-these images, set env var `FEDERATION_PUSH_REPO_BASE=gcr.io/google_containers`
+As part of every release, images are pushed to `k8s.gcr.io`. To use
+these images, set env var `FEDERATION_PUSH_REPO_BASE=k8s.gcr.io`
 This will always use the latest image.
 To use the hyperkube image which includes federation-apiserver and
 federation-controller-manager from a specific release, set the
@@ -345,7 +345,7 @@ Once you have the images, you can run these as pods on your existing kubernetes
 The command to run these pods on an existing GCE cluster will look like:

 ```shell
-$ KUBERNETES_PROVIDER=gce FEDERATION_DNS_PROVIDER=google-clouddns FEDERATION_NAME=myfederation DNS_ZONE_NAME=myfederation.example FEDERATION_PUSH_REPO_BASE=gcr.io/google_containers ./federation/cluster/federation-up.sh
+$ KUBERNETES_PROVIDER=gce FEDERATION_DNS_PROVIDER=google-clouddns FEDERATION_NAME=myfederation DNS_ZONE_NAME=myfederation.example FEDERATION_PUSH_REPO_BASE=k8s.gcr.io ./federation/cluster/federation-up.sh
 ```

 `KUBERNETES_PROVIDER` is the cloud provider.
@@ -5,7 +5,7 @@ metadata:
 spec:
  hostNetwork: true
  containers:
-  - image: gcr.io/google_containers/etcd:3.0.17
+  - image: k8s.gcr.io/etcd:3.0.17
    name: etcd-container
    command:
    - /usr/local/bin/etcd
@@ -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
@@ -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 --leader-elect=true 1>>/var/log/kube-controller-manager.log 2>&1
-    image: gcr.io/google_containers/kube-controller-manager:fda24638d51a48baa13c35337fcd4793
+    image: k8s.gcr.io/kube-controller-manager:fda24638d51a48baa13c35337fcd4793
    livenessProbe:
      httpGet:
        path: /healthz
@@ -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
@@ -6,7 +6,7 @@ spec:
  hostNetwork: true
  containers:
  - name: scheduler-elector
-    image: gcr.io/google_containers/podmaster:1.1
+    image: k8s.gcr.io/podmaster:1.1
    command:
    - /podmaster
    - --etcd-servers=http://127.0.0.1:4001
@@ -20,7 +20,7 @@ spec:
    - mountPath: /manifests
      name: manifests
  - name: controller-manager-elector
-    image: gcr.io/google_containers/podmaster:1.1
+    image: k8s.gcr.io/podmaster:1.1
    command:
    - /podmaster
    - --etcd-servers=http://127.0.0.1:4001
@@ -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"
@@ -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"
@@ -7,4 +7,4 @@ metadata:
 spec:
  containers:
  - name: pod-with-no-annotation-container
-    image: gcr.io/google_containers/pause:2.0
+    image: k8s.gcr.io/pause:2.0
@@ -8,4 +8,4 @@ spec:
  schedulerName: default-scheduler
  containers:
  - name: pod-with-default-annotation-container
-    image: gcr.io/google_containers/pause:2.0
+    image: k8s.gcr.io/pause:2.0
@@ -8,4 +8,4 @@ spec:
  schedulerName: my-scheduler
  containers:
  - name: pod-with-second-annotation-container
-    image: gcr.io/google_containers/pause:2.0
+    image: k8s.gcr.io/pause:2.0
@@ -48,7 +48,7 @@ other Kubelet flags you may care:
 # $LOG_DIR is the test output path.
 sudo docker run -it --rm --privileged --net=host \
  -v /:/rootfs -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \
-  gcr.io/google_containers/node-test:0.2
+  k8s.gcr.io/node-test:0.2
 ```

 ## Running Node Conformance Test for Other Architectures
@@ -71,7 +71,7 @@ regular expression of tests you want to run.
 sudo docker run -it --rm --privileged --net=host \
  -v /:/rootfs:ro -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \
  -e FOCUS=MirrorPod \ # Only run MirrorPod test
-  gcr.io/google_containers/node-test:0.2
+  k8s.gcr.io/node-test:0.2
 ```

 To skip specific tests, overwrite the environment variable `SKIP` with the
@@ -81,7 +81,7 @@ regular expression of tests you want to skip.
 sudo docker run -it --rm --privileged --net=host \
  -v /:/rootfs:ro -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \
  -e SKIP=MirrorPod \ # Run all conformance tests but skip MirrorPod test
-  gcr.io/google_containers/node-test:0.2
+  k8s.gcr.io/node-test:0.2
 ```

 Node conformance test is a containerized version of [node e2e test](https://github.com/kubernetes/community/blob/{{page.githubbranch}}/contributors/devel/e2e-node-tests.md).