From 6b47f60f9001b7f34d03a6e89ef87ba3de14c6a2 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Mon, 27 Mar 2017 15:40:51 -0700 Subject: [PATCH 1/3] Update staging container Manually uploaded a :1.1 tag for the staging container, now it's alpine based (1/4th in image size) and no longer has the warning mentioned in #2837. Signed-off-by: Ahmet Alp Balkan --- docs/contribute/stage-documentation-changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contribute/stage-documentation-changes.md b/docs/contribute/stage-documentation-changes.md index d24807ab17..d74c47649b 100644 --- a/docs/contribute/stage-documentation-changes.md +++ b/docs/contribute/stage-documentation-changes.md @@ -61,7 +61,7 @@ for this image. 1. In the root of your cloned repository, enter this command to start a local web server: - docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.0 + docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.1 1. View your staged content at [http://localhost:4000](http://localhost:4000){: target="_blank"}. From df563da5323aefe380e63e9d55a8d3e0e875ad93 Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Tue, 28 Mar 2017 11:03:49 +0800 Subject: [PATCH 2/3] Fix the link The old link and title have changed. Updating them would be better. --- docs/concepts/overview/components.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/overview/components.md b/docs/concepts/overview/components.md index 7ac01baa20..d5132b9a3d 100644 --- a/docs/concepts/overview/components.md +++ b/docs/concepts/overview/components.md @@ -82,7 +82,7 @@ in their DNS searches. #### User interface The kube-ui provides a read-only overview of the cluster state. Access -[the UI using kubectl proxy](/docs/user-guide/connecting-to-applications-proxy/#connecting-to-the-kube-ui-service-from-your-local-workstation) +[Using an HTTP Proxy to Access the Kubernetes API](/docs/tasks/access-kubernetes-api/http-proxy-access-api/) #### Container Resource Monitoring From 7fa8b63fa8bdfd31454c2ac9285a73dcb21de78d Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Tue, 28 Mar 2017 08:55:04 +0800 Subject: [PATCH 3/3] add some links With these links, it may help users easier to find the concepts. --- docs/concepts/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/concepts/index.md b/docs/concepts/index.md index a14a889e55..dd241d15a6 100644 --- a/docs/concepts/index.md +++ b/docs/concepts/index.md @@ -10,10 +10,10 @@ To work with Kubernetes, you use *Kubernetes API objects* to describe your clust Once you've set your desired state, the *Kubernetes Control Plane* works to make the cluster's current state match the desired state. To do so, Kubernetes performs a variety of tasks automatically--such as starting or restarting containers, scaling the number of replicas of a given application, and more. The Kubernetes Control Plane consists of a collection of processes running on your cluster: -* The **Kubernetes Master** is a collection of three processes that run on a single node in your cluster, which is designated as the master node. Those processes are: kube-apiserver, kube-controller-manager and kube-scheduler. +* The **Kubernetes Master** is a collection of three processes that run on a single node in your cluster, which is designated as the master node. Those processes are: [kube-apiserver](/docs/admin/kube-apiserver/), [kube-controller-manager](/docs/admin/kube-controller-manager/) and [kube-scheduler](/docs/admin/kube-scheduler/). * Each individual non-master node in your cluster runs two processes: - * **kubelet**, which communicates with the Kubernetes Master. - * **kube-proxy**, a network proxy which reflects Kubernetes networking services on each node. + * **[kubelet](/docs/admin/kubelet/)**, which communicates with the Kubernetes Master. + * **[kube-proxy](/docs/admin/kube-proxy/)**, a network proxy which reflects Kubernetes networking services on each node. ## Kubernetes Objects