Merge branch 'master' into master

ankurshukla · web-flow · commit ca4b0226af1b · 2016-12-11T17:52:06.000-08:00
diff --git a/docs/admin/authentication.md b/docs/admin/authentication.md
@@ -35,8 +35,8 @@ or be treated as an anonymous user.
 ## Authentication strategies
 
 Kubernetes uses client certificates, bearer tokens, an authenticating proxy, or HTTP basic auth to
-authenticate API requests through authentication plugins. As HTTP request are
-made to the API server plugins attempts to associate the following attributes
+authenticate API requests through authentication plugins. As HTTP requests are
+made to the API server, plugins attempt to associate the following attributes
 with the request:
 
 * Username: a string which identifies the end user. Common values might be `kube-admin` or `jane@example.com`.
@@ -420,7 +420,7 @@ enterprise directory, kerberos, etc.)
 ### Creating Certificates
 
 When using client certificate authentication, you can generate certificates
-using an existing deployment script or manually through `easyrsa` or `openssl.``
+using an existing deployment script or manually through `easyrsa` or `openssl.`
 
 #### Using an Existing Deployment Script
 
diff --git a/docs/admin/node.md b/docs/admin/node.md
diff --git a/docs/admin/rescheduler.md b/docs/admin/rescheduler.md
@@ -43,6 +43,7 @@ killed for this purpose.
 
 Rescheduler doesn't have any user facing configuration (component config) or API.
 It's enabled by default. It can be disabled:
+
 * during cluster setup by setting `ENABLE_RESCHEDULER` flag to `false`
 * on running cluster by deleting its manifest from master node
 (default path `/etc/kubernetes/manifests/rescheduler.manifest`)
@@ -51,6 +52,7 @@ It's enabled by default. It can be disabled:
 
 To be critical an add-on has to run in `kube-system` namespace (cofigurable via flag)
 and have the following annotations specified:
+
 * `scheduler.alpha.kubernetes.io/critical-pod` set to empty string
 * `scheduler.alpha.kubernetes.io/tolerations` set to `[{"key":"CriticalAddonsOnly", "operator":"Exists"}]`
 
diff --git a/docs/getting-started-guides/minikube.md b/docs/getting-started-guides/minikube.md
diff --git a/docs/hellonode.md b/docs/hellonode.md
@@ -340,7 +340,7 @@ We can now build and publish a new container image to the registry with an incre
 
 ```shell
 docker build -t gcr.io/$PROJECT_ID/hello-node:v2 .
-gcloud docker push gcr.io/$PROJECT_ID/hello-node:v2
+gcloud docker -- push gcr.io/$PROJECT_ID/hello-node:v2
 ```
 
 Building and pushing this updated image should be much quicker as we take full advantage of the Docker cache.
diff --git a/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md b/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
@@ -25,8 +25,7 @@ for database debugging.
 
 1. Create a pod:
 
-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/access-application-cluster/redis-master.yaml
+        kubectl create -f http://k8s.io/docs/tasks/access-application-cluster/redis-master.yaml
 
     The output of a successful command verifies that the pod was created:
 
diff --git a/docs/tasks/administer-cluster/assign-pods-nodes.md b/docs/tasks/administer-cluster/assign-pods-nodes.md
@@ -59,8 +59,7 @@ a `disktype=ssd` label.
 1. Use the configuration file to create a pod that will get scheduled on your
    chosen node:
 
-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/administer-cluster/pod.yaml
+        kubectl create -f http://k8s.io/docs/tasks/administer-cluster/pod.yaml
 
 1. Verify that the pod is running on your chosen node:
 
diff --git a/docs/tasks/configure-pod-container/assign-cpu-ram-container.md b/docs/tasks/configure-pod-container/assign-cpu-ram-container.md
@@ -43,8 +43,7 @@ for the `Pod`:
 
 1. Create a Pod based on the YAML configuration file:
 
-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/configure-pod-container/cpu-ram.yaml
+        kubectl create -f http://k8s.io/docs/tasks/configure-pod-container/cpu-ram.yaml
 
 1. Display information about the pod:
 
diff --git a/docs/tasks/configure-pod-container/define-command-argument-container.md b/docs/tasks/configure-pod-container/define-command-argument-container.md
@@ -39,8 +39,7 @@ file for the Pod defines a command and two arguments:
 
 1. Create a Pod based on the YAML configuration file:
 
-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/configure-pod-container/commands.yaml
+        kubectl create -f http://k8s.io/docs/tasks/configure-pod-container/commands.yaml
 
 1. List the running Pods:
 
diff --git a/docs/tasks/configure-pod-container/define-environment-variable-container.md b/docs/tasks/configure-pod-container/define-environment-variable-container.md
@@ -33,8 +33,7 @@ Pod:
 
 1. Create a Pod based on the YAML configuration file:
 
-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/configure-pod-container/envars.yaml
+        kubectl create -f http://k8s.io/docs/tasks/configure-pod-container/envars.yaml
 
 1. List the running Pods:
 
diff --git a/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md b/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
@@ -32,12 +32,11 @@ In this exercise, you create a Pod that runs one container.
 The configuration file specifies a command that runs when
 the container starts.
 
-{% include code.html language="yaml" file="termination.yaml" ghlink="/docs/tasks/debug-pod-container/termination.yaml" %}
+{% include code.html language="yaml" file="termination.yaml" ghlink="/docs/tasks/debug-application-cluster/termination.yaml" %}
 
 1. Create a Pod based on the YAML configuration file:
 
-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/debug-pod-container/termination.yaml
+        kubectl create -f http://k8s.io/docs/tasks/debug-application-cluster/termination.yaml
 
     In the YAML file, in the `cmd` and `args` fields, you can see that the
     container sleeps for 10 seconds and then writes "Sleep expired" to
@@ -70,7 +69,7 @@ the container starts.
 
 1. Use a Go template to filter the output so that it includes
 only the termination message:
-        
+
 ```
 {% raw %}    kubectl get pod termination-demo -o go-template="{{range .status.containerStatuses}}{{.lastState.terminated.message}}{{end}}"{% endraw %}
 ```
@@ -99,7 +98,7 @@ Set `terminationMessagePath` as shown here:
 
 {% capture whatsnext %}
 
-* See the `terminationMessagePath` field in 
+* See the `terminationMessagePath` field in
   [Container](/docs/api-reference/v1/definitions#_v1_container).
 * Learn about [retrieving logs](/docs/user-guide/logging/).
 * Learn about [Go templates](https://golang.org/pkg/text/template/).
diff --git a/docs/tutorials/kubernetes-basics/cluster-intro.html b/docs/tutorials/kubernetes-basics/cluster-intro.html
@@ -72,7 +72,7 @@ <h2 style="color: #3771e3;">Cluster Diagram</h2>
 
 		<div class="row">
 			<div class="col-md-8">
-				<p><b>The Master is responsible for managing the cluster.</b> The master coordinates all activity in your cluster, such as scheduling applications, maintaining applications' desired state, scaling applications, and rolling out new updates.</p>
+				<p><b>The Master is responsible for managing the cluster.</b> The master coordinates all activities in your cluster, such as scheduling applications, maintaining applications' desired state, scaling applications, and rolling out new updates.</p>
 				<p><b>A node is a VM or a physical computer that serves as a worker machine in a Kubernetes cluster.</b> Each node has a Kubelet, which is an agent for managing the node and communicating with the Kubernetes master. The node should also have tools for handling container operations, such as Docker or rkt. A Kubernetes cluster that handles production traffic should have a minimum of three nodes.</p>
 
 			</div>
@@ -87,7 +87,7 @@ <h2 style="color: #3771e3;">Cluster Diagram</h2>
 			<div class="col-md-8">
 				<p>When you deploy applications on Kubernetes, you tell the master to start the application containers. The master schedules the containers to run on the cluster's nodes. <b>The nodes communicate with the master using the Kubernetes API</b>, which the master exposes. End users can also use the Kubernetes API directly to interact with the cluster.</p>
 
-				<p>A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use <a href="https://github.com/kubernetes/minikube">minikube</a>.  Minikube is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, Mac OS  and Windows systems. The minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this bootcamp, however, you'll use a provided online terminal with minikube pre-installed.</p>
+				<p>A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use <a href="https://github.com/kubernetes/minikube">Minikube</a>.  Minikube is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, Mac OS  and Windows systems. The Minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this bootcamp, however, you'll use a provided online terminal with Minikube pre-installed.</p>
 
 				<p>Now that you know what Kubernetes is, let’s go to the online tutorial and start our first cluster!</p>
 
diff --git a/docs/tutorials/kubernetes-basics/deploy-intro.html b/docs/tutorials/kubernetes-basics/deploy-intro.html
@@ -70,7 +70,7 @@ <h2 style="color: #3771e3;">Deploying your first app on Kubernetes</h2>
 
                 <p>You can create and manage a Deployment by using the Kubernetes command line interface, <b>Kubectl</b>. Kubectl uses the Kubernetes API to interact with the cluster. In this module, you'll learn the most common Kubectl commands needed to create Deployments that run your applications on a Kubernetes cluster.</p>
 
-				<p>When you create a Deployment, you'll need to specify the container image for your application and the number of replicas that you want to run. You can change that information later by updating your Deployment; Modules <a href="5-0.html">5</a> and <a href="5-0.html">6</a> of the bootcamp discuss how you can update your Deployments.</p>
+				<p>When you create a Deployment, you'll need to specify the container image for your application and the number of replicas that you want to run. You can change that information later by updating your Deployment; Modules <a href="/docs/tutorials/kubernetes-basics/scale-intro/">5</a> and <a href="/docs/tutorials/kubernetes-basics/update-intro/">6</a> of the bootcamp discuss how you can scale and update your Deployments.</p>
 
 
 
@@ -85,7 +85,7 @@ <h2 style="color: #3771e3;">Deploying your first app on Kubernetes</h2>
 
 		<div class="row">
 			<div class="col-md-8">
-				<p>For our first Deployment, we’ll use a <a href="https://nodejs.org">NodeJS</a> application packaged in a Docker container. The source code and the Dockerfile are available in the <a href="https://github.com/kubernetes/kubernetes-bootcamp">GitHub repository</a> for the Kubernetes Bootcamp.</p>
+				<p>For our first Deployment, we’ll use a <a href="https://nodejs.org">Node.js</a> application packaged in a Docker container. The source code and the Dockerfile are available in the <a href="https://github.com/kubernetes/kubernetes-bootcamp">GitHub repository</a> for the Kubernetes Bootcamp.</p>
 
 				<p>Now that you know what Deployments are, let’s go to the online tutorial and deploy our first app!</p>
 
diff --git a/docs/tutorials/kubernetes-basics/explore-intro.html b/docs/tutorials/kubernetes-basics/explore-intro.html
@@ -27,7 +27,7 @@ <h3>Objectives</h3>
 
 			<div class="col-md-8">
 				<h2>Kubernetes Pods</h2>
-				<p>When you created a Deployment in Module <a href="/docs/tutorials/kubernetes-basics/deploy-app.html">2</a>, Kubernetes created a <b>Pod</b> to host your application instance. A Pod is Kubernetes abstraction that represents a group of one or more application containers (such as Docker or rkt), and some shared resources for those containers. Those resources include:</p>
+				<p>When you created a Deployment in Module <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>, Kubernetes created a <b>Pod</b> to host your application instance. A Pod is Kubernetes abstraction that represents a group of one or more application containers (such as Docker or rkt), and some shared resources for those containers. Those resources include:</p>
 				<ul>
 					<li>Shared storage, as Volumes</li>
 					<li>Networking, as a unique cluster IP address</li>
@@ -106,15 +106,15 @@ <h2 style="color: #3771e3;">Node overview</h2>
 		<div class="row">
 			<div class="col-md-8">
 				<h2>Troubleshooting with kubectl</h2>
-				<p>In Module <a href="2-0.html">2</a>, you used Kubectl command-line interface. You'll continue to use it in Module 3 to get information about deployed applications and their environments. The most common operations can be done with the following kubectl commands:</p>
+				<p>In Module <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>, you used Kubectl command-line interface. You'll continue to use it in Module 3 to get information about deployed applications and their environments. The most common operations can be done with the following kubectl commands:</p>
 				<ul>
 					<li><b>kubectl get</b> - list resources</li>
 					<li><b>kubectl describe</b> - show detailed information about a resource</li>
 					<li><b>kubectl logs</b> - print the logs from a container in a pod</li>
 					<li><b>kubectl exec</b> - execute a command on a container in a pod</li>
 				</ul>
 
-				<p>You can use these commands to see when applications were deployed, what their current status is, where they are running and what their configuration is.</p>
+				<p>You can use these commands to see when applications were deployed, what their current statuses are, where they are running and what their configurations are.</p>
 
 				<p>Now that we know more about our cluster components and the command line, let’s explore our application.</p>
 
diff --git a/docs/tutorials/kubernetes-basics/expose-intro.html b/docs/tutorials/kubernetes-basics/expose-intro.html
@@ -71,7 +71,7 @@ <h2 style="color: #3771e3;">Services overview</h2>
 
 				<p>A Service provides load balancing of traffic across the contained set of Pods. This is useful when a service is created to group all Pods from a specific Deployment (our application will make use of this in the next module, when we’ll have multiple instances running).</p>
 
-				<p>Services are also responsible for service-discovery within the cluster (covered in Module 6). This will for example allow a frontend service (like a web server) to receive traffic from a backend service (like a database) without worrying about Pods.</p>
+				<p>Services are also responsible for service-discovery within the cluster (covered in <a href="/docs/user-guide/connecting-applications/#accessing-the-service">Accessing the Service</a>). This will for example allow a frontend service (like a web server) to receive traffic from a backend service (like a database) without worrying about Pods.</p>
 
 				<p>Services match a set of Pods using Label Selectors, a grouping primitive that allows logical operation on Labels.</p>
 
@@ -119,7 +119,7 @@ <h2 style="color: #3771e3;">Labels</h2>
 				<p>Labels can be attached to objects at the creation time or later and can be modified at any time.
 				The kubectl run command sets some default Labels/Label Selectors on the new Pods/ Deployment. The link between Labels and Label Selectors defines the relationship between the Deployment and the Pods it creates.</p>
 
-				<p>Let’s expose now our application with the help of a Service, and apply some new Labels.</p>
+				<p>Now let’s expose our application with the help of a Service, and apply some new Labels.</p>
 			</div>
 		</div>
 		<br>
diff --git a/docs/tutorials/kubernetes-basics/scale-intro.html b/docs/tutorials/kubernetes-basics/scale-intro.html
@@ -25,7 +25,7 @@ <h3>Objectives</h3>
 			<div class="col-md-8">
        <h3>Scaling an application</h3>
 
-			<p>In the previous modules we created a <a href="http://kubernetes.io/docs/user-guide/deployments/"> Deployment</a>, and then exposed it publicly via a <a href="http://kubernetes.io/docs/user-guide/services/"> Service </a>. The Deployment created  only one Pod for running our application.  When traffic increases, we will need to scale the application to keep up with  user demand.</p>
+			<p>In the previous modules we created a <a href="http://kubernetes.io/docs/user-guide/deployments/"> Deployment</a>, and then exposed it publicly via a <a href="http://kubernetes.io/docs/user-guide/services/">Service</a>. The Deployment created only one Pod for running our application.  When traffic increases, we will need to scale the application to keep up with  user demand.</p>
 
 			<p><b>Scaling</b> is accomplished by changing the number of replicas in a Deployment</p>
 
diff --git a/docs/tutorials/kubernetes-basics/update-intro.html b/docs/tutorials/kubernetes-basics/update-intro.html
@@ -25,10 +25,10 @@ <h3>Objectives</h3>
 			<div class="col-md-8">
 			<h3>Updating an application</h3>
 
-			<p>Users expect applications to be available all the time and developers are expected to deploy new versions of them several times a day. In Kubernetes this is done with rolling updates. <b>Rolling updates</b> allows Deployments to occur with zero downtime by incrementally updating Pods instances with new ones. The new Pods will be scheduled on Nodes with available resources.</p>
+			<p>Users expect applications to be available all the time and developers are expected to deploy new versions of them several times a day. In Kubernetes this is done with rolling updates. <b>Rolling updates</b> allow Deployments' update to take place with zero downtime by incrementally updating Pods instances with new ones. The new Pods will be scheduled on Nodes with available resources.</p>
 
 			<p>In the previous module we scaled our application to run multiple instances. This is a requirement for performing updates without affecting application availability. By default, the maximum number of Pods that can be unavailable during the update and the maximum number of new Pods that can be created, is one. Both options can be configured to either numbers or percentages (of Pods).
-			In Kubernetes, updates are versioned and any Deployment update can be reverted to a previously (stable) version.</p>
+			In Kubernetes, updates are versioned and any Deployment update can be reverted to previous (stable) version.</p>
 
 			</div>
 			<div class="col-md-4">
@@ -39,7 +39,7 @@ <h3>Summary:</h3>
 					</ul>
 				</div>
 				<div class="content__box content__box_fill">
-					<p><i>Rolling updates allows Deployments update with zero downtime by incrementally updating Pods instances with new ones. </i></p>
+					<p><i>Rolling updates allow Deployments' update to take place with zero downtime by incrementally updating Pods instances with new ones. </i></p>
 				</div>
 			</div>
 		</div>
diff --git a/docs/tutorials/stateless-application/expose-external-ip-address-service.md b/docs/tutorials/stateless-application/expose-external-ip-address-service.md
@@ -103,7 +103,7 @@ provides load balancing for an application that has two running instances.
 
         curl http://<public-node-ip>:<node-port>
 
-    where `<public-node-ip>` us the public IP address of your node,
+    where `<public-node-ip>` is the public IP address of your node,
     and `<node-port>` is the NodePort value for your service.
 
     The response to a successful request is a hello message:
diff --git a/docs/tutorials/stateless-application/expose-external-ip-address.md b/docs/tutorials/stateless-application/expose-external-ip-address.md
@@ -64,7 +64,7 @@ external IP address.
         NAME         CLUSTER-IP     EXTERNAL-IP      PORT(S)    AGE
         my-service   10.3.245.137   104.198.205.71   8080/TCP   54s
 
-    Note: If the external IP address is shown as <pending>, wait for a minute
+    Note: If the external IP address is shown as \<pending\>, wait for a minute
     and enter the same command again.
 
 1. Display detailed information about the Service:
@@ -110,7 +110,7 @@ external IP address.
 
         curl http://<external-ip>:<port>
 
-    where `<external-ip>` us the external IP address of your Service,
+    where `<external-ip>` is the external IP address of your Service,
     and `<port>` is the value of `Port` in your Service description.
 
     The response to a successful request is a hello message:
diff --git a/docs/tutorials/stateless-application/run-stateless-application-deployment.md b/docs/tutorials/stateless-application/run-stateless-application-deployment.md
@@ -37,8 +37,7 @@ a Deployment that runs the nginx:1.7.9 Docker image:
 
 1. Create a Deployment based on the YAML file:
 
-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tutorials/stateless-application/deployment.yaml
+        kubectl create -f http://k8s.io/docs/tutorials/stateless-application/deployment.yaml
 
 1. Display information about the Deployment:
 
@@ -81,7 +80,7 @@ specifies that the deployment should be updated to use nginx 1.8.
 
 1. Apply the new YAML file:
 
-        kubectl apply -f $REPO/docs/tutorials/stateless-application/deployment-update.yaml
+        kubectl apply -f http://k8s.io/docs/tutorials/stateless-application/deployment-update.yaml
 
 1. Watch the deployment create pods with new names and delete the old pods:
 
@@ -97,7 +96,7 @@ should have four pods:
 
 1. Apply the new YAML file:
 
-        kubectl apply -f $REPO/docs/tutorials/stateless-application/deployment-scale.yaml
+        kubectl apply -f http://k8s.io/docs/tutorials/stateless-application/deployment-scale.yaml
 
 1. Verify that the Deployment has four pods:
 
diff --git a/docs/user-guide/config-best-practices.md b/docs/user-guide/config-best-practices.md
diff --git a/docs/user-guide/kubectl-cheatsheet.md b/docs/user-guide/kubectl-cheatsheet.md
diff --git a/docs/user-guide/labels.md b/docs/user-guide/labels.md
diff --git a/docs/user-guide/prereqs.md b/docs/user-guide/prereqs.md
diff --git a/docs/user-guide/production-pods.md b/docs/user-guide/production-pods.md
diff --git a/docs/user-guide/services/index.md b/docs/user-guide/services/index.md
