From 8dff71a36bcb726cb7706ede9983fb97c78fbf90 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 6 Apr 2018 15:13:09 -0400 Subject: [PATCH] Pass 2: k8s GCR vanity URL (#8006) --- cn/docs/concepts/workloads/controllers/daemonset.yaml | 4 ++-- docs/admin/federation/index.md | 3 ++- docs/concepts/cluster-administration/device-plugins.md | 2 +- docs/concepts/policy/pod-security-policy.md | 8 ++++---- docs/concepts/workloads/controllers/daemonset.yaml | 2 +- docs/getting-started-guides/scratch.md | 10 +++++----- .../contribute/generated-reference/federation-api.md | 2 +- .../setup-tools/kubeadm/implementation-details.md | 4 ++-- docs/setup/independent/high-availability.md | 2 +- .../event-exporter-deploy.yaml | 2 +- .../debug-application-cluster/fluentd-gcp-ds.yaml | 2 +- 11 files changed, 21 insertions(+), 20 deletions(-) diff --git a/cn/docs/concepts/workloads/controllers/daemonset.yaml b/cn/docs/concepts/workloads/controllers/daemonset.yaml index e01d14d800..17efe6f186 100644 --- a/cn/docs/concepts/workloads/controllers/daemonset.yaml +++ b/cn/docs/concepts/workloads/controllers/daemonset.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: fluentd-elasticsearch - image: gcr.io/google-containers/fluentd-elasticsearch:1.20 + image: k8s.gcr.io/fluentd-elasticsearch:1.20 resources: limits: memory: 200Mi @@ -33,4 +33,4 @@ spec: path: /var/log - name: varlibdockercontainers hostPath: - path: /var/lib/docker/containers \ No newline at end of file + path: /var/lib/docker/containers diff --git a/docs/admin/federation/index.md b/docs/admin/federation/index.md index 0ec3b9b0d1..e435fcbd7e 100644 --- a/docs/admin/federation/index.md +++ b/docs/admin/federation/index.md @@ -315,7 +315,8 @@ official release images or you can build from HEAD. #### Using official release images -As part of every release, images are pushed to `k8s.gcr.io`. To use +As part of every release, images are pushed to `staging-k8s.gcr.io`, which are +re-published through `k8s.gcr.io` (which is globally replicated). 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 diff --git a/docs/concepts/cluster-administration/device-plugins.md b/docs/concepts/cluster-administration/device-plugins.md index 7e955fbba7..17256bfad2 100644 --- a/docs/concepts/cluster-administration/device-plugins.md +++ b/docs/concepts/cluster-administration/device-plugins.md @@ -63,7 +63,7 @@ metadata: spec: containers: - name: demo-container-1 - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 resources: limits: vendor-domain/resource: 2 # requesting 2 vendor-domain/resource diff --git a/docs/concepts/policy/pod-security-policy.md b/docs/concepts/policy/pod-security-policy.md index d17a5e700f..dd2a072eb1 100644 --- a/docs/concepts/policy/pod-security-policy.md +++ b/docs/concepts/policy/pod-security-policy.md @@ -203,7 +203,7 @@ metadata: spec: containers: - name: pause - image: gcr.io/google-containers/pause + image: k8s.gcr.io/pause EOF Error from server (Forbidden): error when creating "STDIN": pods "pause" is forbidden: unable to validate against any pod security policy: [] ``` @@ -247,7 +247,7 @@ metadata: spec: containers: - name: pause - image: gcr.io/google-containers/pause + image: k8s.gcr.io/pause EOF pod "pause" created ``` @@ -264,7 +264,7 @@ metadata: spec: containers: - name: pause - image: gcr.io/google-containers/pause + image: k8s.gcr.io/pause securityContext: privileged: true EOF @@ -282,7 +282,7 @@ $ kubectl-user delete pod pause Let's try that again, slightly differently: ```shell -$ kubectl-user run pause --image=gcr.io/google-containers/pause +$ kubectl-user run pause --image=k8s.gcr.io/pause deployment "pause" created $ kubectl-user get pods No resources found. diff --git a/docs/concepts/workloads/controllers/daemonset.yaml b/docs/concepts/workloads/controllers/daemonset.yaml index 6d571b91c5..c576ede377 100644 --- a/docs/concepts/workloads/controllers/daemonset.yaml +++ b/docs/concepts/workloads/controllers/daemonset.yaml @@ -19,7 +19,7 @@ spec: effect: NoSchedule containers: - name: fluentd-elasticsearch - image: gcr.io/google-containers/fluentd-elasticsearch:1.20 + image: k8s.gcr.io/fluentd-elasticsearch:1.20 resources: limits: memory: 200Mi diff --git a/docs/getting-started-guides/scratch.md b/docs/getting-started-guides/scratch.md index b0d6bfaef5..2e731d99ea 100644 --- a/docs/getting-started-guides/scratch.md +++ b/docs/getting-started-guides/scratch.md @@ -182,7 +182,7 @@ we recommend that you run these as containers, so you need an image to be built. You have several choices for Kubernetes images: - Use images hosted on Google Container Registry (GCR): - - For example `gcr.io/google-containers/hyperkube:$TAG`, where `TAG` is the latest + - For example `k8s.gcr.io/hyperkube:$TAG`, where `TAG` is the latest release tag, which can be found on the [latest releases page](https://github.com/kubernetes/kubernetes/releases/latest). - Ensure $TAG is the same tag as the release tag you are using for kubelet and kube-proxy. - The [hyperkube](https://releases.k8s.io/{{page.githubbranch}}/cmd/hyperkube) binary is an all in one binary @@ -197,7 +197,7 @@ You have several choices for Kubernetes images: For etcd, you can: -- Use images hosted on Google Container Registry (GCR), such as `gcr.io/google-containers/etcd:2.2.1` +- Use images hosted on Google Container Registry (GCR), such as `k8s.gcr.io/etcd:2.2.1` - Use images hosted on [Docker Hub](https://hub.docker.com/search/?q=etcd) or [Quay.io](https://quay.io/repository/coreos/etcd), such as `quay.io/coreos/etcd:v2.2.1` - Use etcd binary included in your OS distro. - Build your own image @@ -209,8 +209,8 @@ The recommended version number can also be found as the value of `TAG` in `kuber The remainder of the document assumes that the image identifiers have been chosen and stored in corresponding env vars. Examples (replace with latest tags and appropriate registry): - - `HYPERKUBE_IMAGE=gcr.io/google-containers/hyperkube:$TAG` - - `ETCD_IMAGE=gcr.io/google-containers/etcd:$ETCD_VERSION` + - `HYPERKUBE_IMAGE=k8s.gcr.io/hyperkube:$TAG` + - `ETCD_IMAGE=k8s.gcr.io/etcd:$ETCD_VERSION` ### Security Models @@ -782,7 +782,7 @@ Use `ps` or `docker ps` to verify that each process has started. For example, v ```shell $ sudo docker ps | grep apiserver -5783290746d5 gcr.io/google-containers/kube-apiserver:e36bf367342b5a80d7467fd7611ad873 "/bin/sh -c '/usr/lo'" 10 seconds ago Up 9 seconds k8s_kube-apiserver.feb145e7_kube-apiserver-kubernetes-master_default_eaebc600cf80dae59902b44225f2fc0a_225a4695 +5783290746d5 k8s.gcr.io/kube-apiserver:e36bf367342b5a80d7467fd7611ad873 "/bin/sh -c '/usr/lo'" 10 seconds ago Up 9 seconds k8s_kube-apiserver.feb145e7_kube-apiserver-kubernetes-master_default_eaebc600cf80dae59902b44225f2fc0a_225a4695 ``` Then try to connect to the apiserver: diff --git a/docs/home/contribute/generated-reference/federation-api.md b/docs/home/contribute/generated-reference/federation-api.md index 0e31ab7ac9..9f85c018a4 100644 --- a/docs/home/contribute/generated-reference/federation-api.md +++ b/docs/home/contribute/generated-reference/federation-api.md @@ -57,7 +57,7 @@ hack/update-federation-api-reference-docs.sh ``` The script runs the -[gcr.io/google_containers/gen-swagger-docs](https://console.cloud.google.com/gcr/images/google-containers/GLOBAL/gen-swagger-docs?gcrImageListquery=%255B%255D&gcrImageListpage=%257B%2522t%2522%253A%2522%2522%252C%2522i%2522%253A0%257D&gcrImageListsize=50&gcrImageListsort=%255B%257B%2522p%2522%253A%2522uploaded%2522%252C%2522s%2522%253Afalse%257D%255D) +[k8s.gcr.io/gen-swagger-docs](https://console.cloud.google.com/gcr/images/google-containers/GLOBAL/gen-swagger-docs?gcrImageListquery=%255B%255D&gcrImageListpage=%257B%2522t%2522%253A%2522%2522%252C%2522i%2522%253A0%257D&gcrImageListsize=50&gcrImageListsort=%255B%257B%2522p%2522%253A%2522uploaded%2522%252C%2522s%2522%253Afalse%257D%255D) image to generate this set of reference docs: * /docs/api-reference/extensions/v1beta1/operations.html diff --git a/docs/reference/setup-tools/kubeadm/implementation-details.md b/docs/reference/setup-tools/kubeadm/implementation-details.md index b7219b98e2..275c5dfd57 100644 --- a/docs/reference/setup-tools/kubeadm/implementation-details.md +++ b/docs/reference/setup-tools/kubeadm/implementation-details.md @@ -204,7 +204,7 @@ Static Pod manifest share a set of common properties: Please note that: -1. All the images, for the `--kubernetes-version`/current architecture, will be pulled from `gcr.io/google_containers`; +1. All the images, for the `--kubernetes-version`/current architecture, will be pulled from `k8s.gcr.io`; In case an alternative image repository or CI image repository is specified this one will be used; In case a specific container image should be used for all control plane components, this one will be used. see [using custom images](kubeadm-init.md/#custom-images) for more details @@ -301,7 +301,7 @@ a local etcd instance running in a Pod with following attributes: Please note that: -1. The etcd image will be pulled from `gcr.io/google_containers`. In case an alternative image repository is specified this one will be used; +1. The etcd image will be pulled from `k8s.gcr.io`. In case an alternative image repository is specified this one will be used; In case an alternative image name is specified, this one will be used. see [using custom images](kubeadm-init.md/#custom-images) for more details 2. in case of kubeadm is executed in the `--dry-run` mode, the etcd static Pod manifest is written in a temporary folder 3. Static Pod manifest generation for local etcd can be invoked individually with the [`kubeadm alpha phase etcd local`](kubeadm-alpha.md/#cmd-phase-etcd) command diff --git a/docs/setup/independent/high-availability.md b/docs/setup/independent/high-availability.md index db4dd5dbe3..17d909d8fd 100644 --- a/docs/setup/independent/high-availability.md +++ b/docs/setup/independent/high-availability.md @@ -334,7 +334,7 @@ Please select one of the tabs to see installation instructions for the respectiv - --initial-cluster etcd0=https://:2380,etcd1=https://:2380,etcd2=https://:2380 \ - --initial-cluster-token my-etcd-token \ - --initial-cluster-state new - image: gcr.io/google_containers/etcd-amd64:3.1.10 + image: k8s.gcr.io/etcd-amd64:3.1.10 livenessProbe: httpGet: path: /health diff --git a/docs/tasks/debug-application-cluster/event-exporter-deploy.yaml b/docs/tasks/debug-application-cluster/event-exporter-deploy.yaml index a96825e89e..759b2ce9c1 100644 --- a/docs/tasks/debug-application-cluster/event-exporter-deploy.yaml +++ b/docs/tasks/debug-application-cluster/event-exporter-deploy.yaml @@ -41,7 +41,7 @@ spec: serviceAccountName: event-exporter-sa containers: - name: event-exporter - image: gcr.io/google-containers/event-exporter:v0.1.0 + image: k8s.gcr.io/event-exporter:v0.1.0 command: - '/event-exporter' terminationGracePeriodSeconds: 30 diff --git a/docs/tasks/debug-application-cluster/fluentd-gcp-ds.yaml b/docs/tasks/debug-application-cluster/fluentd-gcp-ds.yaml index 7edd2c107e..3eaf6098f9 100644 --- a/docs/tasks/debug-application-cluster/fluentd-gcp-ds.yaml +++ b/docs/tasks/debug-application-cluster/fluentd-gcp-ds.yaml @@ -25,7 +25,7 @@ spec: dnsPolicy: Default containers: - name: fluentd-gcp - image: gcr.io/google-containers/fluentd-gcp:2.0.2 + image: k8s.gcr.io/fluentd-gcp:2.0.2 # If fluentd consumes its own logs, the following situation may happen: # fluentd fails to send a chunk to the server => writes it to the log => # tries to send this message to the server => fails to send a chunk and so on.