Merge branch 'master' into release-1.12

This commit is contained in:
Tim Fogarty
2018-11-01 14:10:31 -07:00
146 changed files with 4631 additions and 773 deletions
@@ -19,7 +19,6 @@ This document walks you through an example of enabling Horizontal Pod Autoscaler
{{% /capture %}}
{{< toc >}}
{{% capture prerequisites %}}
@@ -386,7 +385,7 @@ section to your HorizontalPodAutoscaler manifest to specify that you need one wo
averageValue: 30
```
When possible, it's preferrable to use the custom metric target types instead of external metrics, since it's
When possible, it's preferable to use the custom metric target types instead of external metrics, since it's
easier for cluster administrators to secure the custom metrics API. The external metrics API potentially allows
access to any metric, so cluster administrators should take care when exposing it.