From 33b68cd10295c78f4134e4f251033896859790cd Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Mon, 1 Aug 2016 11:32:15 -0700 Subject: [PATCH] Update the references to federation control plane images/binaries in the federation admin guide. --- docs/admin/federation/index.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/admin/federation/index.md b/docs/admin/federation/index.md index fc077ec839..7bcf7cc612 100644 --- a/docs/admin/federation/index.md +++ b/docs/admin/federation/index.md @@ -17,8 +17,9 @@ This guide also assumes that we have the Kubernetes source code that can be ## Setting up a federation control plane Setting up federation requires running the federation control plane which -consists of etcd, federation-apiserver and federation-controller-manager. -We can run these binaries as pods on an existing Kubernetes cluster. +consists of etcd, federation-apiserver (via hyperkube binary) and +federation-controller-manager (via hyperkube binary). We can run these +binaries as pods on an existing Kubernetes cluster. ### Getting images @@ -30,7 +31,9 @@ official release images or we can build from HEAD. As part of every release, images are pushed to `gcr.io/google_containers`. To use these images, we set env var `FEDERATION_PUSH_REPO_BASE=gcr.io/google_containers` This will always use the latest image. -To use federation-apiserver and federation-controller-manager images from a specific release, we can set `FEDERATION_IMAGE_TAG`. +To use the hyperkube image which includes federation-apiserver and +federation-controller-manager from a specific release, we can set +`FEDERATION_IMAGE_TAG`. #### Building and pushing images from HEAD