whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6036 from mahdix/patch-4

Browse Source 
Fix changed URL for google containers
This commit is contained in:
Joseph Heck
2017-10-25 12:08:38 -07:00
committed by GitHub
parent cc3cac9772 0069133e8a
commit e66bd75b0a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/getting-started-guides/scratch.md
+5 -5
View File
@@ -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: You have several choices for Kubernetes images:
- Use images hosted on Google Container Registry (GCR): - Use images hosted on Google Container Registry (GCR):
- For example `gcr.io/google_containers/hyperkube:$TAG`, where `TAG` is the latest - For example `gcr.io/google-containers/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). 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. - 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 - 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: 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 `gcr.io/google-containers/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 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. - Use etcd binary included in your OS distro.
- Build your own image - 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): 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` - `HYPERKUBE_IMAGE=gcr.io/google-containers/hyperkube:$TAG`
- `ETCD_IMAGE=gcr.io/google_containers/etcd:$ETCD_VERSION` - `ETCD_IMAGE=gcr.io/google-containers/etcd:$ETCD_VERSION`
### Security Models ### Security Models
@@ -819,7 +819,7 @@ Use `ps` or `docker ps` to verify that each process has started. For example, v
```shell ```shell
$ sudo docker ps | grep apiserver $ 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 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
``` ```
Then try to connect to the apiserver: Then try to connect to the apiserver: