Merge branch 'master' into release-1.9

2017-12-08 14:07:34 -06:00
parent edf3472d6a e2d51afeb8
commit 979be56653
9 changed files with 57 additions and 12 deletions
@@ -0,0 +1,9 @@
+id: annotation
+name: Annotation
+full-link: docs/concepts/overview/working-with-objects/annotations
+tags:
+- fundamental
+short-description: >
+  A key-value pair that is used to attach arbitrary non-identifying metadata to objects.
+long-description: >
+  The metadata in an annotation can be small or large, structured or unstructured, and can include characters not permitted by labels. Clients such as tools and libraries can retrieve this metadata.
@@ -0,0 +1,15 @@
+id: horizontal-pod-autoscaler
+name: Horizontal Pod Autoscaler
+full-link: /docs/tasks/run-application/horizontal-pod-autoscale/
+aka:
+- HPA
+related:
+- pod
+tags:
+- operation
+short-description: >
+  An API resource that automatically scales the number of pod replicas based on targeted CPU
+  utilization or custom metric targets.
+long-description: >
+  HPA is typically used with replication controllers, deployments or replica sets and cannot be
+  applied to objects that cannot be scaled, for example DaemonSets.  
@@ -0,0 +1,9 @@
+id: labels
+name: Labels
+full-link: /docs/concepts/overview/working-with-objects/labels
+tags:
+- fundamental
+short-description: >
+  Used to tag objects with identifying attributes that are meaningful and relevant to users.
+long-description: >
+  Labels are key/value pairs that are attached to objects, such as pods. They can be used to organize and to select subsets of objects.
@@ -7,7 +7,7 @@ cid: community
 <section id="hero" class="light-text">
    <h1>Community</h1>
 </section>
-<a href="https://goo.gl/QsHxQH"><img src="/images/KubeCon_NA_Community.jpg" alt="KubeConNA" width="100%" align="center"></a>
+<a href="http://events.linuxfoundation.org/events/kubecon-and-cloudnativecon-europe"><img src="/images/KubeCon_EU_Community.jpg" alt="KubeConEU" width="100%" align="center"></a>
 <section id="mainContent">
    <main>
        <div class="content">
@@ -1,6 +1,9 @@
 ---
 approvers:
 - smarterclayton
+- liggitt
+- ericchiang
+- destijl
 title: Securing a Cluster
 ---

@@ -68,6 +71,15 @@ to prevent accidental escalation. You can make roles specific to your use case i

 Consult the [authorization reference section](/docs/admin/authorization/) for more information.

+## Controlling access to the Kubelet
+
+Kubelets expose HTTPS endpoints which give access to data of varying sensitivity, and allow performing operations with varying levels of power on the node and within containers.
+
+By default, Kubelets allow full access to those endpoints.
+
+To secure access to those endpoints, enable Kubelet authentication and authorization.
+
+Consult the [Kubelet authentication/authorization reference](/docs/admin/kubelet-authentication-authorization) for more information.

 ## Controlling the capabilities of a workload or user at runtime

@@ -151,7 +163,7 @@ access to a subset of the keyspace is strongly recommended.

 ### Enable audit logging

-The [audit logger](/docs/tasks/debug-application-cluster/audit/) is an alpha feature that records actions taken by the
+The [audit logger](/docs/tasks/debug-application-cluster/audit/) is a beta feature that records actions taken by the
 API for later analysis in the event of a compromise. It is recommended to enable audit logging 
 and archive the audit file on a secure server.

@@ -4,14 +4,14 @@ approvers:
 - jszczepkowski
 - justinsb
 - directxman12
-title: Horizontal Pod Autoscaling Walkthrough
+title: Horizontal Pod Autoscaler Walkthrough
 ---

-Horizontal Pod Autoscaling automatically scales the number of pods
+Horizontal Pod Autoscaler automatically scales the number of pods
 in a replication controller, deployment or replica set based on observed CPU utilization
 (or, with beta support, on some other, application-provided metrics).

-This document walks you through an example of enabling Horizontal Pod Autoscaling for the php-apache server.  For more information on how Horizontal Pod Autoscaling behaves, see the [Horizontal Pod Autoscaling user guide](/docs/tasks/run-application/horizontal-pod-autoscale/).
+This document walks you through an example of enabling Horizontal Pod Autoscaler for the php-apache server.  For more information on how Horizontal Pod Autoscaler behaves, see the [Horizontal Pod Autoscaler user guide](/docs/tasks/run-application/horizontal-pod-autoscaler/).

 ## Prerequisites

@@ -24,7 +24,7 @@ heapster monitoring will be turned-on by default).
 To specify multiple resource metrics for a Horizontal Pod Autoscaler, you must have a Kubernetes cluster
 and kubectl at version 1.6 or later.  Furthermore, in order to make use of custom metrics, your cluster
 must be able to communicate with the API server providing the custom metrics API.
-See the [Horizontal Pod Autoscaling user guide](/docs/tasks/run-application/horizontal-pod-autoscale/#support-for-custom-metrics) for more details.
+See the [Horizontal Pod Autoscaler user guide](/docs/tasks/run-application/horizontal-pod-autoscaler/#support-for-custom-metrics) for more details.

 ## Step One: Run & expose php-apache server

@@ -3,18 +3,18 @@ approvers:
 - fgrzadkowski
 - jszczepkowski
 - directxman12
-title: Horizontal Pod Autoscaling
+title: Horizontal Pod Autoscaler
 ---

-This document describes the current state of Horizontal Pod Autoscaling in Kubernetes.
+This document describes the current state of the Horizontal Pod Autoscaler in Kubernetes.

-## What is Horizontal Pod Autoscaling?
+## What is the Horizontal Pod Autoscaler?

-With Horizontal Pod Autoscaling, Kubernetes automatically scales the number of pods
+The Horizontal Pod Autoscaler automatically scales the number of pods
 in a replication controller, deployment or replica set based on observed CPU utilization (or, with
 [custom metrics](https://git.k8s.io/community/contributors/design-proposals/instrumentation/custom-metrics-api.md)
 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.
+Pod Autoscaling does not apply to objects that can't be scaled, for example, DaemonSets.

 The Horizontal Pod Autoscaler is implemented as a Kubernetes API resource and a controller.
 The resource determines the behavior of the controller.
@@ -64,7 +64,7 @@ cid: home
        <button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
        <br>
        <br>
-        <a href="https://goo.gl/naJfWk" button id= "desktopKCButton">Attend KubeCon in Austin, TX on December 6-8, 2017</a>
+        <a href="http://events.linuxfoundation.org/events/kubecon-and-cloudnativecon-europe" button id= "desktopKCButton">Attend KubeCon in Copenhagen on May 2-4, 2018</a>
  </div>
  <button id="mobileShowVideoButton" onclick="kub.showVideo()"></button>
 </section>