Merge branch 'master' into patch-34

_data/guides.yml

@@ -54,16 +54,12 @@ toc:
 - title: Containers and Pods
   section:
   - docs/user-guide/pods/multi-container.md
-  - docs/user-guide/pods/init-container.md
   - docs/user-guide/pod-templates.md
   - docs/user-guide/environment-guide/index.md
   - docs/user-guide/compute-resources.md
-  - docs/user-guide/pod-states.md
   - docs/user-guide/liveness/index.md
   - docs/user-guide/container-environment.md
   - docs/user-guide/node-selection/index.md
-  - docs/user-guide/downward-api/index.md
-  - docs/user-guide/downward-api/volume/index.md
   - docs/user-guide/petset/bootstrapping/index.md
 
 - title: Monitoring, Logging, and Debugging Containers
@@ -74,7 +70,6 @@ toc:
     - docs/user-guide/logging/overview.md
     - docs/user-guide/logging/stackdriver.md
     - docs/user-guide/logging/elasticsearch.md
-  - docs/user-guide/getting-into-containers.md
   - docs/user-guide/connecting-to-applications-proxy.md
   - docs/user-guide/connecting-to-applications-port-forward.md
   - title: Using Explorer to Examine the Runtime Environment

docs/concepts/cluster-administration/out-of-resource.md

@@ -106,7 +106,7 @@ To configure hard eviction thresholds, the following flag is supported:
 * `eviction-hard` describes a set of eviction thresholds (e.g. `memory.available<1Gi`) that if met
 would trigger a pod eviction.
 
-The `kubelet` has the following default hard eviction thresholds:
+The `kubelet` has the following default hard eviction threshold:
 
 * `--eviction-hard=memory.available<100Mi`
 

docs/concepts/index.md

@@ -8,7 +8,7 @@ The Concepts section helps you learn about the parts of the Kubernetes system an
 
 To work with Kubernetes, you use *Kubernetes API objects* to describe your cluster's *desired state*: what applications or other workloads you want to run, what container images they use, the number of replicas, what network and disk resources you want to make available, and more. You set your desired state by creating objects using the Kubernetes API, typically via the command-line interface, `kubectl`. You can also use the Kubernetes API directly to interact with the cluster and set or modify your desired state.
 
-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, Kuberentes 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: 
+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 four processes that run on a single node in your cluster, which is designated as the master node.
 * Each individual non-master node in your cluster runs two processes:

docs/concepts/workloads/pods/init-containers.md

@@ -227,7 +227,7 @@ validation error is thrown for any Container sharing a name with another.
 ### Resources
 
 Given the ordering and execution for Init Containers, the following rules
-for resource usage apply:
+for resource usage application:
 
 * The highest of any particular resource request or limit defined on all Init
   Containers is the *effective init request/limit*

docs/getting-started-guides/kubeadm.md

@@ -173,10 +173,9 @@ The key is used for mutual authentication between the master and the joining nod
 By default, your cluster will not schedule pods on the master for security reasons.
 If you want to be able to schedule pods on the master, for example if you want a single-machine Kubernetes cluster for development, run:
 
-    # kubectl taint nodes --all dedicated-
-    node "test-01" tainted
-    taint key="dedicated" and effect="" not found.
-    taint key="dedicated" and effect="" not found.
+    # MASTER_NODE="actual_master_node_name"
+    # TAINT_KEY=$(kubectl get no ${MASTER_NODE} --template="{{(index .spec.taints 0).key}}")
+    # kubectl taint nodes ${MASTER_NODE} ${TAINT_KEY}-
 
 This will remove the "dedicated" taint from any nodes that have it, including the master node, meaning that the scheduler will then be able to schedule pods everywhere.
 

docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md

@@ -75,7 +75,7 @@ Elasticsearch, and is part of a service named `kibana-logging`.
 
 The Elasticsearch and Kibana services are both in the `kube-system` namespace
 and are not directly exposed via a publicly reachable IP address. To reach them,
-follow the instructions for [Accessing services running in a cluster](/docs/user-guide/accessing-the-cluster/#accessing-services-running-on-the-cluster).
+follow the instructions for [Accessing services running in a cluster](/docs/concepts/cluster-administration/access-cluster/#accessing-services-running-on-the-cluster).
 
 If you try accessing the `elasticsearch-logging` service in your browser, you'll
 see a status page that looks something like this:

docs/user-guide/deployments.md

@@ -80,61 +80,6 @@ The created Replica Set will ensure that there are three nginx Pods at all times
 
 **Note:** You must specify appropriate selector and pod template labels of a Deployment (in this case, `app = nginx`), i.e. don't overlap with other controllers (including Deployments, Replica Sets, Replication Controllers, etc.) Kubernetes won't stop you from doing that, and if you end up with multiple controllers that have overlapping selectors, those controllers will fight with each other's and won't behave correctly.
 
-## The Status of a Deployment
-
-After creating or updating a Deployment, you would want to confirm whether it succeeded or not. The simplest way to do this is through `kubectl rollout status`.
-
-```shell
-$ kubectl rollout status deployment/nginx-deployment
-deployment "nginx-deployment" successfully rolled out
-```
-
-This verifies the Deployment's `.status.observedGeneration` >= `.metadata.generation`, and its up-to-date replicas
-(`.status.updatedReplicas`) matches the desired replicas (`.spec.replicas`) to determine if the rollout succeeded.
-It also expects that the available replicas running (`.spec.availableReplicas`) will be at least the minimum required
-based on the Deployment strategy. If the rollout is still in progress, it watches for Deployment status changes and
-prints related messages. 
-
-```shell
-$ kubectl rollout status deployment/nginx-deployment
-Waiting for rollout to finish: 2 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 2 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 2 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 3 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 3 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 4 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 4 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 4 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 4 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 4 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 5 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 5 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 5 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 5 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 6 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 6 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 6 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 6 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 6 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 7 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 7 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 7 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 7 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 8 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 8 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 8 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 9 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 9 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 9 out of 10 new replicas have been updated...
-Waiting for rollout to finish: 1 old replicas are pending termination...
-Waiting for rollout to finish: 1 old replicas are pending termination...
-Waiting for rollout to finish: 1 old replicas are pending termination...
-Waiting for rollout to finish: 9 of 10 updated replicas are available...
-deployment "nginx-deployment" successfully rolled out
-```
-
-For more information about the status of a Deployment [read more here](#deployment-status).
-
 
 ## Updating a Deployment
 

docs/user-guide/kubectl/index.md

@@ -11,7 +11,7 @@ kubectl controls the Kubernetes cluster manager
 
 kubectl controls the Kubernetes cluster manager.
 
-Find more information at https://github.com/kubernetes/kubernetes.
+Find more information at [https://github.com/kubernetes/kubernetes](https://github.com/kubernetes/kubernetes).
 
 ```
 kubectl

editdocs.md

@@ -13,6 +13,8 @@ $( document ).ready(function() {
     	$("#continueEdit").show();
     	$("#continueEditButton").text("Edit " + forwarding);
     	$("#continueEditButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/edit/master/" + forwarding)
+    	$("#viewOnGithubButton").text("View " + forwarding + " on GitHub");
+    	$("#viewOnGithubButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/tree/master/" + forwarding)
     } else {
         $("#generalInstructions").show();
     	$("#continueEdit").hide();
@@ -26,6 +28,7 @@ $( document ).ready(function() {
 <p>Click the button below to edit the page you were just on. When you are done, click <b>Commit Changes</b> at the bottom of the screen. This creates a copy of our site in your GitHub account called a <i>fork</i>. You can make other changes in your fork after it is created, if you want. When you are ready to send us all your changes, go to the index page for your fork and click <b>New Pull Request</b> to let us know about it.</p>
 
 <p><a id="continueEditButton" class="button"></a></p>
+<p><a id="viewOnGithubButton" class="button"></a></p>
 
 </div>
 <div id="generalInstructions">

robots.txt

@@ -9,12 +9,20 @@ Disallow: 404.html
 Disallow: /docs/user-guide/configuring-containers
 Disallow: /docs/user-guide/containers
 Disallow: /docs/user-guide/deploying-applications
+Disallow: /docs/user-guide/getting-into-containers
+>>>>>>> fb2ab359... Remove from TOC/Search: pods/init-containers ...
 Disallow: /docs/user-guide/liveness/index
+Disallow: /docs/user-guide/pod-states
 Disallow: /docs/user-guide/simple-nginx
 Disallow: /docs/user-guide/production-pods
 Disallow: /docs/user-guide/quick-start
 
+Disallow: /docs/user-guide/downward-api/index
+Disallow: /docs/user-guide/downward-api/volume/index
+
 Disallow: /docs/user-guide/persistent-volumes/walkthrough
+
+Disallow: /docs/user-guide/pods/init-container
 Disallow: /docs/user-guide/pods/single-container
 
 Disallow: /docs/user-guide/secrets/walkthrough

skip_toc_check.txt

@@ -8,4 +8,11 @@ docs/user-guide/walkthrough/k8s201.md
 docs/user-guide/logging-demo/README.md
 docs/user-guide/downward-api/README.md
 docs/user-guide/configmap/README.md
-docs/concepts/abstractions/pod-termination.md
+docs/concepts/abstractions/pod-termination.md
+
+docs/user-guide/pods/init-container.md
+docs/user-guide/pod-states.md
+docs/user-guide/downward-api/index.md
+docs/user-guide/downward-api/volume/index.md
+docs/user-guide/getting-into-containers.md
+