merge master to 1.10, with fixes (#7682)

kubernetes · Mar 8, 2018 · 44b51d6 · 44b51d6
1 parent bb8c59a
commit 44b51d6
Show file tree

Hide file tree

Showing 548 changed files with 12,601 additions and 319,589 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -14,7 +14,7 @@
 
 
 **Page to Update:**
-http://kubernetes.io/...
+https://kubernetes.io/...
 
 <!--Optional Information (remove the comment tags around information you would like to include)-->
 <!--Kubernetes Version:-->

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,6 @@
+>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> For 1.10 Features: set Milestone to 1.10 and Base Branch to release-1.10
+>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 > NOTE: After opening the PR, please *un-check and re-check* the ["Allow edits from maintainers"](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) box so that maintainers can work on your patch and speed up the review process. This is a temporary workaround to address a known issue with GitHub.> 
 >
 > Please delete this note before submitting the pull request.

diff --git a/Gemfile b/Gemfile
@@ -27,7 +27,7 @@ group :jekyll_plugins do
    gem "jekyll-github-metadata", "~> 2.2"
    gem "jekyll-optional-front-matter", "~> 0.1"
    gem "jekyll-readme-index", "0.0.3"
-   gem "jekyll-redirect-from", "~> 0.11"
+   gem "jekyll-redirect-from", "~> 0.13"
    gem "jekyll-relative-links", "~> 0.2"
    gem "jekyll-swiss", "~> 0.4"
    gem "jekyll-theme-architect", "0.0.3"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -47,7 +47,7 @@ GEM
     jekyll-paginate (1.1.0)
     jekyll-readme-index (0.0.3)
       jekyll (~> 3.0)
-    jekyll-redirect-from (0.12.1)
+    jekyll-redirect-from (0.13.0)
       jekyll (~> 3.3)
     jekyll-relative-links (0.5.1)
       jekyll (~> 3.3)
@@ -145,7 +145,7 @@ DEPENDENCIES
   jekyll-optional-front-matter (~> 0.1)
   jekyll-paginate (= 1.1.0)
   jekyll-readme-index (= 0.0.3)
-  jekyll-redirect-from (~> 0.11)
+  jekyll-redirect-from (~> 0.13)
   jekyll-relative-links (~> 0.2)
   jekyll-seo-tag
   jekyll-sitemap

diff --git a/OWNERS b/OWNERS
@@ -2,10 +2,12 @@ reviewers:
 - tengqm
 - zhangxiaoyu-zidif
 - xiangpengzhao
+- bradtopol
 approvers:
 - heckj
 - a-mccarthy
 - abiogenesis-now
 - bradamant3
 - steveperry-53
 - zacharysarah
+- chenopis
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -92,6 +92,7 @@ aliases:
     - bradamant3
     - steveperry-53
     - zacharysarah
+    - bradtopol
   sig-federation: #Team: Federation; e.g. Federated Clusters
     - csbell
   sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
@@ -149,9 +150,9 @@ aliases:
     - feiskyer
     - nebril
   sig-openstack: #GH: sig-openstack-pr-reviews
-    - idvoretskyi
-    - xsgordon
-    - NickrenREN
+    - hogepodge
+    - dklyle
+    - rjmorse
   sig-pm: #aka Product Management
     - apsinha
     - idvoretskyi

diff --git a/_config.yml b/_config.yml
@@ -13,6 +13,7 @@ incremental: true
 safe: false
 lsi: false
 
+latest: "v1.9"
 defaults:
   -
     scope:

diff --git a/_data/concepts.yml b/_data/concepts.yml
@@ -1,9 +1,11 @@
 bigheader: "Concepts"
 abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
+landing_page: /docs/concepts/index/
 toc:
 - docs/concepts/index.md
 
 - title: Overview
+  landing_page: /docs/concepts/overview/what-is-kubernetes/
   section:
   - docs/concepts/overview/what-is-kubernetes.md
   - docs/concepts/overview/components.md
@@ -23,12 +25,14 @@ toc:
     - docs/concepts/overview/object-management-kubectl/declarative-config.md
 
 - title: Kubernetes Architecture
+  landing_page: /docs/concepts/architecture/nodes/
   section:
   - docs/concepts/architecture/nodes.md
   - docs/concepts/architecture/master-node-communication.md
   - docs/concepts/architecture/cloud-controller.md
 
 - title: Extending Kubernetes
+  landing_page: /docs/concepts/api-extension/custom-resources/
   section:
   - docs/concepts/overview/extending.md
   - title: Extending the Kubernetes API
@@ -43,12 +47,14 @@ toc:
   - docs/concepts/service-catalog/index.md
 
 - title: Containers
+  landing_page: /docs/concepts/containers/images/
   section:
   - docs/concepts/containers/images.md
   - docs/concepts/containers/container-environment-variables.md
   - docs/concepts/containers/container-lifecycle-hooks.md
 
 - title: Workloads
+  landing_page: /docs/concepts/workloads/pods/pod-overview/
   section:
   - title: Pods
     section:
@@ -70,6 +76,7 @@ toc:
     - docs/concepts/workloads/controllers/cron-jobs.md
 
 - title: Configuration
+  landing_page: /docs/concepts/configuration/overview/
   section:
   - docs/concepts/configuration/overview.md
   - docs/concepts/configuration/manage-compute-resources-container.md
@@ -80,6 +87,7 @@ toc:
   - docs/concepts/configuration/pod-priority-preemption.md
 
 - title: Services, Load Balancing, and Networking
+  landing_page: /docs/concepts/services-networking/service/
   section:
   - docs/concepts/services-networking/service.md
   - docs/concepts/services-networking/dns-pod-service.md
@@ -89,13 +97,15 @@ toc:
   - docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md
 
 - title: Storage
+  landing_page: /docs/concepts/storage/volumes/
   section:
   - docs/concepts/storage/volumes.md
   - docs/concepts/storage/persistent-volumes.md
   - docs/concepts/storage/storage-classes.md
   - docs/concepts/storage/dynamic-provisioning.md
 
 - title: Cluster Administration
+  landing_page: /docs/concepts/cluster-administration/cluster-administration-overview/
   section:
   - docs/concepts/cluster-administration/cluster-administration-overview.md
   - docs/concepts/cluster-administration/certificates.md
@@ -116,5 +126,3 @@ toc:
     section:
     - docs/concepts/policy/resource-quotas.md
     - docs/concepts/policy/pod-security-policy.md
-
-
diff --git a/_data/docs-home.yml b/_data/docs-home.yml
@@ -1,26 +1,24 @@
-bigheader: "Documentation Home"
+bigheader: "About"
 abstract: "Documentation for using and learning about Kubernetes."
 toc:
 - docs/home/index.md
-- docs/home/supported-doc-versions.md
 
-- title: Release Notes
-  path: https://git.k8s.io/kubernetes/CHANGELOG.md
-- title: Release Roadmap
-  path: https://github.com/kubernetes/kubernetes/milestones/
-
-- docs/tasks/debug-application-cluster/troubleshooting.md
+- title: Supported Doc Versions
+  path: /docs/home/supported-doc-versions/
 
 - title: Contributing to the Kubernetes Docs
+  landing_page: /editdocs/
   section:
   - editdocs.md
+  - docs/home/contribute/participating.md
   - docs/home/contribute/create-pull-request.md
   - docs/home/contribute/write-new-topic.md
   - docs/home/contribute/stage-documentation-changes.md
   - docs/home/contribute/page-templates.md
   - docs/home/contribute/review-issues.md
   - docs/home/contribute/style-guide.md
   - docs/home/contribute/includes.md
+  - docs/home/contribute/localization.md
 
   - title: Updating Automatically Generated Reference Pages
     section:

diff --git a/_data/glossary/annotation.yaml b/_data/glossary/annotation.yaml
@@ -1,6 +1,6 @@
 id: annotation
 name: Annotation
-full-link: docs/concepts/overview/working-with-objects/annotations
+full-link: /docs/concepts/overview/working-with-objects/annotations
 tags:
 - fundamental
 short-description: >

diff --git a/_data/glossary/certificate.yaml b/_data/glossary/certificate.yaml
@@ -0,0 +1,11 @@
+id: certificate
+name: Certificate
+full-link: /docs/tasks/tls/managing-tls-in-a-cluster/
+tags:
+- security
+short-description: >
+  A cryptographically secure file used to validate access to the Kubernetes cluster.
+long-description: >
+  Certificates enable applications within a Kubernetes
+  cluster to access the Kubernetes API securely. Certificates validate that
+  clients are allowed to access the API.
diff --git a/_data/glossary/cloud-controller-manager.yml b/_data/glossary/cloud-controller-manager.yml
@@ -0,0 +1,13 @@
+id: cloud-controller-manager
+name: Cloud Controller Manager
+full-link: https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/
+tags:
+- core-object
+- architecture
+- operation
+short-description: >
+  Cloud Controller Manager is an alpha feature in 1.8. In upcoming releases it will be the preferred way to integrate Kubernetes with any cloud.
+long-description: >
+  Kubernetes v1.6 contains a new binary called cloud-controller-manager. cloud-controller-manager is a daemon that embeds cloud-specific control loops. 
+  These cloud-specific control loops were originally in the kube-controller-manager. Since cloud providers develop and release at a different pace compared to the Kubernetes 
+  project, abstracting the provider-specific code to the cloud-controller-manager binary allows cloud vendors to evolve independently from the core Kubernetes code.
diff --git a/_data/glossary/code-contributor.yaml b/_data/glossary/code-contributor.yaml
@@ -1,5 +1,6 @@
 id: code-contributor
 name: Code Contributor
+full-link: /docs/imported/community/devel/
 aka:
   - Community Developer
 tags:

diff --git a/_data/glossary/container-env-variables.yaml b/_data/glossary/container-env-variables.yaml
@@ -0,0 +1,9 @@
+id: container-env-variables
+name: Container Environment Variables
+full-link: /docs/concepts/containers/container-environment-variables.md
+tags:
+- fundamental
+short-description: >
+  Container environment variables are name/value pairs that provide useful information into containers running in a Pod.
+long-description: >
+  Container environment variables provide information that is required by the running containerized applications along with information about important resources to the [Containers] {% glossary_tooltip text="Containers" term_id="container" %}. For example, file system, information about the container itself and other cluster resources such as service endpoints, etc.
diff --git a/_data/glossary/customresourcedefinition.yaml b/_data/glossary/customresourcedefinition.yaml
@@ -0,0 +1,14 @@
+id: CustomResourceDefinition
+name: CustomResourceDefinition
+aka: 
+- CRD
+- Formerly Known as ThirdPartyResources (TPR)
+tags:
+- fundamental
+- operation
+- extension
+full-link: docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/
+short-description: >
+  Custom code that defines a resource to add to your Kubernetes API server without building a complete custom server.
+long-description: >
+  Custom Resource Definitions let you extend the Kubernetes API for your environment if the publicly supported API resources can't meet your needs. 
diff --git a/_data/glossary/daemonset.yaml b/_data/glossary/daemonset.yaml
@@ -3,8 +3,9 @@ name: DaemonSet
 full-link: /docs/concepts/workloads/controllers/daemonset
 tags:
 - fundamental
+- core-object
 - workload
 short-description: >
-  Ensures a copy of a {% glossary_tooltip term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip term_id="cluster" %}.
+  Ensures a copy of a {% glossary_tooltip text="Pod" term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip text="cluster" term_id="cluster" %}.
 long-description: >
   Used to deploy system daemons such as log collectors and monitoring agents that typically must run on every {% glossary_tooltip term_id="node" %}.
diff --git a/_data/glossary/docker.yaml b/_data/glossary/docker.yaml
@@ -0,0 +1,9 @@
+id: docker
+name: docker
+full-link: /docs/reference/kubectl/docker-cli-to-kubectl/
+tags:
+- fundamental
+short-description: >
+  Docker is a software technology providing operating-system-level virtualization also known as containers.
+long-description: >
+  Docker uses the resource isolation features of the Linux kernel such as cgroups and kernel namespaces, and a union-capable file system such as OverlayFS and others to allow independent "containers" to run within a single Linux instance, avoiding the overhead of starting and maintaining virtual machines (VMs).
diff --git a/_data/glossary/dynamic-volume-provisioning.yaml b/_data/glossary/dynamic-volume-provisioning.yaml
@@ -0,0 +1,11 @@
+id: dynamicvolumeprovisioning
+name: Dynamic Volume Provisioning
+full-link: /docs/concepts/storage/dynamic-provisioning
+tags:
+- core-object
+- storage
+short-description: >
+  Allows users to request automatic creation of storage  {% glossary_tooltip text="Volumes" term_id="volume" %}.
+long-description: >
+  Dynamic provisioning eliminates the need for cluster administrators to pre-provision storage. Instead, it automatically provisions storage by user request.
+  Dynamic volume provisioning is based on an API object, {% glossary_tooltip text="StorageClass" term_id="storage-class" %}, referring to a {% glossary_tooltip text="Volume Plugin" term_id="volume-plugin" %} that provisions a {% glossary_tooltip text="Volume" term_id="volume" %} and the set of parameters to pass to the Volume Plugin.
diff --git a/_data/glossary/init-container.yaml b/_data/glossary/init-container.yaml
@@ -0,0 +1,8 @@
+id: init-container
+name: Init Container
+tags:
+- fundamental
+short-description: >
+  One or more initialization containers that must run to completion before any app containers run. 
+long-description: >
+  Initialization (init) containers are like regular app containers, with one difference: init containers must run to completion before any app containers can start. Init containers run in series: each init container must run to completion before the next init container begins.  
diff --git a/_data/glossary/job.yaml b/_data/glossary/job.yaml
@@ -2,7 +2,9 @@ id: job
 name: Job
 full-link: /docs/concepts/workloads/controllers/jobs-run-to-completion
 tags:
+- fundamental
 - core-object
+- workload
 short-description: >
   A finite or batch task that runs to completion.
 long-description: >

diff --git a/_data/glossary/kube-proxy.yaml b/_data/glossary/kube-proxy.yaml
@@ -0,0 +1,10 @@
+id: kube proxy
+name: kube-proxy
+full-link: /docs/reference/generated/kube-proxy
+tags:
+- fundamental
+- core-object
+short-description: >
+  `kube-proxy` is a network proxy that runs on each node in the cluster.
+long-description: >
+  `kube-proxy` is responsible for request forwarding. `kube-proxy` allows TCP and UDP stream forwarding or round robin TCP and UDP forwarding across a set of backend functions.
diff --git a/_data/glossary/kubelet.yaml b/_data/glossary/kubelet.yaml
@@ -1,6 +1,6 @@
 id: kubelet
 name: Kubelet
-full-link: docs/reference/generated/kubelet
+full-link: /docs/reference/generated/kubelet
 tags:
 - fundamental
 - core-object

diff --git a/_data/glossary/labels.yaml → _data/glossary/label.yaml b/_data/glossary/labels.yaml → _data/glossary/label.yaml
diff --git a/_data/glossary/namespace.yaml b/_data/glossary/namespace.yaml
@@ -4,7 +4,7 @@ full-link: /docs/concepts/overview/working-with-objects/namespaces
 tags:
   - fundamental
 short-description: >
-  An abstraction used by Kubernetes to support multiple virtual clusters on the same physical {% glossary_tooltip term_id="cluster" %}.
+  An abstraction used by Kubernetes to support multiple virtual clusters on the same physical {% glossary_tooltip text="cluster" term_id="cluster" %}.
 long-description: >
   Namespaces are used to organize objects in a cluster and provide a way to divide cluster resources.
   Names of resources need to be unique within a namespace, but not across namespaces.
diff --git a/_data/glossary/persistent-volume.yaml b/_data/glossary/persistent-volume.yaml
@@ -10,8 +10,8 @@ tags:
 - core-object
 - storage
 short-description: >
-  An API object that represents a piece of storage in the cluster. Available as a general, pluggable resource that persists beyond the lifecycle of any individual {% glossary_tooltip term_id="pod" %}.
+  An API object that represents a piece of storage in the cluster. Available as a general, pluggable resource that persists beyond the lifecycle of any individual {% glossary_tooltip text="Pod" term_id="pod" %}.
 long-description: |
   PersistentVolumes (PVs) provide an API that abstracts details of how storage is provided from how it is consumed.
-  PVs are used directly in scenarios where storage can be be created ahead of time (static provisioning).
+  PVs are used directly in scenarios where storage can be created ahead of time (static provisioning).
   For scenarios that require on-demand storage (dynamic provisioning), PersistentVolumeClaims (PVCs) are used instead.
diff --git a/_data/glossary/podpreset.yaml b/_data/glossary/podpreset.yaml
@@ -0,0 +1,12 @@
+id: podpreset
+name: PodPreset
+tags:
+- operation
+short-description: >
+  An API object that injects information such as secrets, volume mounts,
+  and environment variables into pods at creation time.
+long-description: >
+  This object chooses the pods to inject information into using
+  standard selectors. This allows the podspec definitions to be
+  nonspecific, decoupling the podspec from environment specific
+  configuration.
diff --git a/_data/glossary/replica-set.yml b/_data/glossary/replica-set.yml
@@ -4,8 +4,9 @@ full-link: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
 related:
 - replication-controller
 tags:
+- fundamental
 - core-object
-- architecture
+- workload
 short-description: >
   ReplicaSet is the next-generation Replication Controller.
 long-description: >

diff --git a/_data/glossary/replication-controller.yaml b/_data/glossary/replication-controller.yaml
@@ -1,7 +1,8 @@
 id: replication-controller
 name: Replication Controller
 tags:
-- fundamental
+- workload
+- core-object
 short-description: >
   Kubernetes service that ensures a specific number of instances of a pod are always running.
 long-description: >