Skip to content

Commit 6e2eb8b

Browse files
committed
update docs to use hyperkube image
1 parent b73c53c commit 6e2eb8b

File tree

1 file changed

+26
-18
lines changed

1 file changed

+26
-18
lines changed

docs/getting-started-guides/scratch.md

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,11 @@ we recommend that you run these as containers, so you need an image to be built.
225225

226226
You have several choices for Kubernetes images:
227227
- Use images hosted on Google Container Registry (GCR):
228-
- e.g `gcr.io/google_containers/kube-apiserver:$TAG`, where `TAG` is the latest
228+
- e.g `gcr.io/google_containers/hyperkube:$TAG`, where `TAG` is the latest
229229
release tag, which can be found on the [latest releases page](https://github.com/GoogleCloudPlatform/kubernetes/releases/latest).
230230
- Ensure $TAG is the same tag as the release tag you are using for kubelet and kube-proxy.
231+
- The [hyperkube](../../cmd/hyperkube/) binary is an all in one binary
232+
- `hyperkube kubelet ...` runs the kublet, `hyperkube apiserver ...` runs an apiserver, etc.
231233
- Build your own images.
232234
- Useful if you are using a private registry.
233235
- The release contains files such as `./kubernetes/server/bin/kube-apiserver.tar` which
@@ -248,9 +250,7 @@ were tested extensively with this version of etcd and not with any other version
248250
The recommended version number can also be found as the value of `ETCD_VERSION` in `kubernetes/cluster/images/etcd/Makefile`.
249251

250252
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):
251-
- `APISERVER_IMAGE=gcr.io/google_containers/kube-apiserver:$TAG`
252-
- `SCHEDULER_IMAGE=gcr.io/google_containers/kube-scheduler:$TAG`
253-
- `CNTRLMNGR_IMAGE=gcr.io/google_containers/kube-controller-manager:$TAG`
253+
- `HYPERKUBE_IMAGE==gcr.io/google_containers/hyperkube:$TAG`
254254
- `ETCD_IMAGE=gcr.io/google_containers/etcd:$ETCD_VERSION`
255255

256256
### Security Models
@@ -546,9 +546,9 @@ The apiserver, controller manager, and scheduler will each run as a pod on the m
546546
For each of these components, the steps to start them running are similar:
547547

548548
1. Start with a provided template for a pod.
549-
1. Set the `APISERVER_IMAGE`, `CNTRLMNGR_IMAGE`, and `SCHEDULER_IMAGE to the values chosen in [Selecting Images](#selecting-images).
549+
1. Set the `HYPERKUBE_IMAGE` to the values chosen in [Selecting Images](#selecting-images).
550550
1. Determine which flags are needed for your cluster, using the advice below each template.
551-
1. Set the `APISERVER_FLAGS`, `CNTRLMNGR_FLAGS, and `SCHEDULER_FLAGS` to the space-separated list of flags for that component.
551+
1. Set the flags to be individual strings in the command array (e.g. $ARGN below)
552552
1. Start the pod by putting the completed template into the kubelet manifest directory.
553553
1. Verify that the pod is started.
554554

@@ -566,11 +566,14 @@ For each of these components, the steps to start them running are similar:
566566
"containers": [
567567
{
568568
"name": "kube-apiserver",
569-
"image": "${APISERVER_IMAGE}",
569+
"image": "${HYPERKUBE_IMAGE}",
570570
"command": [
571-
"/bin/sh",
572-
"-c",
573-
"/usr/local/bin/kube-apiserver $APISERVER_FLAGS"
571+
"/hyperkube",
572+
"apiserver",
573+
"$ARG1",
574+
"$ARG2",
575+
...
576+
"$ARGN"
574577
],
575578
"ports": [
576579
{
@@ -695,11 +698,14 @@ Complete this template for the scheduler pod:
695698
"containers": [
696699
{
697700
"name": "kube-scheduler",
698-
"image": "$SCHEDULER_IMAGE",
701+
"image": "$HYBERKUBE_IMAGE",
699702
"command": [
700-
"/bin/sh",
701-
"-c",
702-
"/usr/local/bin/kube-scheduler --master=127.0.0.1:8080 $SCHEDULER_FLAGS"
703+
"/hyperkube",
704+
"scheduler",
705+
"--master=127.0.0.1:8080",
706+
"$SCHEDULER_FLAG1",
707+
...
708+
"$SCHEDULER_FLAGN"
703709
],
704710
"livenessProbe": {
705711
"httpGet": {
@@ -737,11 +743,13 @@ Template for controller manager pod:
737743
"containers": [
738744
{
739745
"name": "kube-controller-manager",
740-
"image": "$CNTRLMNGR_IMAGE",
746+
"image": "$HYPERKUBE_IMAGE",
741747
"command": [
742-
"/bin/sh",
743-
"-c",
744-
"/usr/local/bin/kube-controller-manager $CNTRLMNGR_FLAGS"
748+
"/hyperkube",
749+
"controller-manager",
750+
"$CNTRLMNGR_FLAG1",
751+
...
752+
"$CNTRLMNGR_FLAGN"
745753
],
746754
"volumeMounts": [
747755
{

0 commit comments

Comments
 (0)