Merge branch 'master' into release-1.4

docs/user-guide/horizontal-pod-autoscaling/index.md

@@ -120,13 +120,14 @@ all running pods. Example:
       alpha/target.custom-metrics.podautoscaler.kubernetes.io: '{"items":[{"name":"qps", "value": "10"}]}'
 ```
 
-In this case if there are 4 pods running and each of them reports qps metric to be equal to 15 HPA will start 2 additional pods so there will be 6 pods in total. If there are multiple metrics passed in the annotation or CPU is configured as well then HPA will use the biggest 
-number of replicas that comes from the calculations.
+In this case, if there are four pods running and each pod reports a QPS metric of 15 or higher, horizontal pod autoscaling will start two additional pods (for a total of six pods running).
+
+If you specify multiple metrics in your annotation or if you set a target CPU utilization, horizontal pod autoscaling will scale to according to the metric that requires the highest number of replicas.
+
+If you do not specify a target for CPU utilization, Kubernetes defaults to an 80% utilization threshold for horizontal pod autoscaling.
+
+If you want to ensure that horizontal pod autoscaling calculates the number of required replicas based only on custom metrics, you should set the CPU utilization target to a very large value (such as 100000%). As this level of CPU utilization isn't possible, horizontal pod autoscaling will calculate based only on the custom metrics (and min/max limits).
 
-At this moment even if target CPU utilization is not specified a default of 80% will be used. 
-To calculate number of desired replicas based only on custom metrics CPU utilization
-target should be set to a very large value (e.g. 100000%). Then CPU-related logic 
-will want only 1 replica, leaving the decision about higher replica count to cusom metrics (and min/max limits).
 
 ## Further reading
 

docs/user-guide/kubectl-cheatsheet.md

@@ -85,7 +85,7 @@ $ kubectl describe pods <rc-name>               # Lists pods created by <rc-name
 $ kubectl get services --sort-by=.metadata.name
 
 # List pods Sorted by Restart Count
-$ kubectl get pods --sort-by=.status.containerStatuses[0].restartCount
+$ kubectl get pods --sort-by='.status.containerStatuses[0].restartCount'
 
 # Get the version label of all pods with label app=cassandra
 $ kubectl get pods --selector=app=cassandra rc -o 'jsonpath={.items[*].metadata.labels.version}'
@@ -95,12 +95,13 @@ $ kubectl get nodes -o jsonpath='{.items[*].status.addresses[?(@.type=="External
 
 # List Names of Pods that belong to Particular RC
 # "jq" command useful for transformations that are too complex for jsonpath
-$ sel=$(./kubectl get rc <rc-name> --output=json | jq -j '.spec.selector | to_entries | .[] | "\(.key)=\(.value),"')
+$ sel=$(kubectl get rc <rc-name> --output=json | jq -j '.spec.selector | to_entries | .[] | "\(.key)=\(.value),"')
 $ sel=${sel%?} # Remove trailing comma
-$ pods=$(kubectl get pods --selector=$sel --output=jsonpath={.items..metadata.name})`
+$ pods=$(kubectl get pods --selector=$sel --output=jsonpath={.items..metadata.name})
+$ echo $pods
 
 # Check which nodes are ready
-$ kubectl get nodes -o jsonpath='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'| tr ';' "\n"  | grep "Ready=True" 
+$ kubectl get nodes -o jsonpath='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'| tr ';' "\n"  | grep "Ready=True"
 ```
 
 ## Modifying and Deleting Resources
@@ -122,6 +123,6 @@ $ kubectl run -i --tty busybox --image=busybox -- sh      # Run pod as interacti
 $ kubectl attach <podname> -i                             # Attach to Running Container
 $ kubectl port-forward <podname> <local-and-remote-port>  # Forward port of Pod to your local machine
 $ kubectl port-forward <servicename> <port>               # Forward port to service
-$ kubectl exec <pod-name> -- ls /                         # Run command in existing pod (1 container case) 
-$ kubectl exec <pod-name> -c <container-name> -- ls /     # Run command in existing pod (multi-container case) 
+$ kubectl exec <pod-name> -- ls /                         # Run command in existing pod (1 container case)
+$ kubectl exec <pod-name> -c <container-name> -- ls /     # Run command in existing pod (multi-container case)
 ```

docs/user-guide/node-selection/index.md

@@ -25,7 +25,7 @@ If this fails with an "invalid command" error, you're likely using an older vers
 
 Also, note that label keys must be in the form of DNS labels (as described in the [identifiers doc](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/identifiers.md)), meaning that they are not allowed to contain any upper-case letters.
 
-You can verify that it worked by re-running `kubectl get nodes` and checking that the node now has a label.
+You can verify that it worked by re-running `kubectl get nodes --show-labels` and checking that the node now has a label.
 
 ### Step Two: Add a nodeSelector field to your pod configuration