Merge branch 'master' into release-1.8

2017-09-20 11:21:34 -07:00
parent 2bd62e674b b2c715d3bf
commit b052e4e803
18 changed files with 680 additions and 40 deletions
@@ -264,7 +264,7 @@ kubectl config view
 ```

 The output shows merged information from all the files listed in your `KUBECONFIG`
-environnment variable. In particular, notice that the merged information has the
+environment variable. In particular, notice that the merged information has the
 `dev-ramp-up` context from the `config-demo-2` file and the three contexts from
 the `config-demo` file:

@@ -12,10 +12,6 @@ This is *not* a guide for people who want to debug their cluster.  For that you
 * TOC
 {:toc}

-## FAQ
-
-Users are highly encouraged to check out our [FAQ](https://github.com/kubernetes/kubernetes/wiki/User-FAQ).
-
 ## Diagnosing the problem

 The first step in troubleshooting is triage.  What is the problem?  Is it your Pods, your Replication Controller or
@@ -31,12 +31,6 @@ development scenarios. The [Reference](/docs/reference/) section provides
 detailed documentation on the [Kubernetes API](/docs/api-reference/{{page.version}}/)
 and command-line interfaces (CLIs), such as [`kubectl`](/docs/user-guide/kubectl-overview/).

-We also have a number of FAQ pages:
-
-   * [User FAQ](https://github.com/kubernetes/kubernetes/wiki/User-FAQ)
-   * [Debugging FAQ](https://github.com/kubernetes/kubernetes/wiki/Debugging-FAQ)
-   * [Services FAQ](https://github.com/kubernetes/kubernetes/wiki/Services-FAQ)
-
 You may also find the Stack Overflow topics relevant:

   * [Kubernetes](http://stackoverflow.com/questions/tagged/kubernetes)
@@ -12,7 +12,7 @@ This document describes the current state of Horizontal Pod Autoscaling in Kuber

 With Horizontal Pod Autoscaling, Kubernetes automatically scales the number of pods
 in a replication controller, deployment or replica set based on observed CPU utilization
-(or, with alpha support, on some other, application-provided metrics). Note that Horizontal 
+(or, with alpha support, on some other, application-provided metrics). Note that Horizontal
 Pod Autoscaling does not apply to objects that can't be scaled, for example, DaemonSet.

 The Horizontal Pod Autoscaler is implemented as a Kubernetes API resource and a controller.
@@ -44,7 +44,7 @@ or the custom metrics API (for all other metrics).

  Please note that if some of the pod's containers do not have the relevant resource request set,
  CPU utilization for the pod will not be defined and the autoscaler will not take any action
-  for that metric. See the [autoscaling algorithm design document](https://git.k8s.io/community/contributors/design-proposals/horizontal-pod-autoscaler.md#autoscaling-algorithm) for further
+  for that metric. See the [autoscaling algorithm design document](https://git.k8s.io/community/contributors/design-proposals/autoscaling/horizontal-pod-autoscaler.md#autoscaling-algorithm) for further
  details about how the autoscaling algorithm works.

 * For per-pod custom metrics, the controller functions similarly to per-pod resource metrics,
@@ -64,7 +64,7 @@ See [Support for custom metrics](#support-for-custom-metrics) for more details o

 The autoscaler accesses corresponding replication controller, deployment or replica set by scale sub-resource.
 Scale is an interface that allows you to dynamically set the number of replicas and examine each of their current states.
-More details on scale sub-resource can be found [here](https://git.k8s.io/community/contributors/design-proposals/horizontal-pod-autoscaler.md#scale-subresource).
+More details on scale sub-resource can be found [here](https://git.k8s.io/community/contributors/design-proposals/autoscaling/horizontal-pod-autoscaler.md#scale-subresource).


 ## API Object
@@ -78,7 +78,7 @@ can be found in `autoscaling/v2alpha1`. The new fields introduced in `autoscalin
 are preserved as annotations when working with `autoscaling/v1`.

 More details about the API object can be found at
-[HorizontalPodAutoscaler Object](https://git.k8s.io/community/contributors/design-proposals/horizontal-pod-autoscaler.md#horizontalpodautoscaler-object).
+[HorizontalPodAutoscaler Object](https://git.k8s.io/community/contributors/design-proposals/autoscaling/horizontal-pod-autoscaler.md#horizontalpodautoscaler-object).

 ## Support for Horizontal Pod Autoscaler in kubectl

@@ -149,6 +149,6 @@ custom metrics API with the API aggregation layer. Both of these API servers mus

 ## Further reading

-* Design documentation: [Horizontal Pod Autoscaling](https://git.k8s.io/community/contributors/design-proposals/horizontal-pod-autoscaler.md).
+* Design documentation: [Horizontal Pod Autoscaling](https://git.k8s.io/community/contributors/design-proposals/autoscaling/horizontal-pod-autoscaler.md).
 * kubectl autoscale command: [kubectl autoscale](/docs/user-guide/kubectl/v1.6/#autoscale).
 * Usage example of [Horizontal Pod Autoscaler](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/).
@@ -131,7 +131,7 @@ Optional fields are:
  is `1m0s`. Valid units are as described for `--poll-interval` above.

 Additional information about the `kubectl rolling-update` command is available
-from the [`kubectl` reference](/docs/user-guide/kubectl/v1.6/#rolling-update).
+from the [`kubectl` reference](/docs/user-guide/kubectl/{{page.version}}/#rolling-update).

 ## Walkthrough