Merge branch 'master' of https://github.com/kubernetes/website into release-1.9

* 'master' of https://github.com/kubernetes/website: (140 commits)
  Update configure-multiple-schedulers.md (kubernetes#6877)
  Explicitly specify the components that need a change (kubernetes#6873)
  Updates to partner page (kubernetes#6797)
  Add steps for extension api-server setup (kubernetes#6667)
  securing a cluster: add recommendations about cloud metadata APIs (kubernetes#6659)
  Namespace glossary term (kubernetes#6607)
  Update device plugin doc with upgrade suggestions and known limitations. (kubernetes#6501)
  Add Kubermatic to pick-right-solution.md (kubernetes#6459)
  extra word
  typo
  Fix concepts/configuration/secret
  Link to extended resources instead of deprecated opaque integer resources
  Fix CI issue
  Corrected the group in runtime-config of ValidatingAdmissionWebhook and MutatingAdmissionWebhook. It should be admissionregistration.k8s.io (was admissionregistration).
  Correct references in Jekyll data files
  Update scheduling-hugepages.md
  Drop reference to outdated FAQ
  Follow sig list to kubernetes/community
  Update scheduling-hugepages.md
  Fix references to ConfigMap for the CN website
  ...

# Conflicts:
#	docs/concepts/policy/pod-security-policy.md

Author: chenopis

OWNERS_ALIASES

@@ -0,0 +1,206 @@
+aliases:
+  sig-api-machinery: #Team: API Server; GH: sig-api-machinery-pr-reviews; e.g. Annotations, Labels
+    - lavalamp
+    - sttts
+    - liggitt
+    - smarterclayton
+    - deads2k
+  sig-apps: #Team: Workloads; GH: sig-apps-pr-reviews; e.g. ConfigMaps, CronJobs, CustomResourceDefinitions, DaemonSets, Deployments, Jobs, Secrets, StatefulSets
+    - enisoc
+    - erictune
+    - foxish
+    - janetkuo
+    - kow3ns
+    - lukaszo
+    - mfojtik
+    - smarterclayton
+    - soltysh
+    - tnozicka
+  sig-architecture: #GH: sig-architecture-pr-reviews
+    - smarterclayton
+    - bgrant0607
+  sig-auth: #GH: sig-auth-pr-reviews
+    - php-coder
+    - liggitt
+    - mikedanese
+    - ericchiang
+    - mattmoyer
+    - enj
+    - deads2k
+    - davidopp
+  sig-autoscaling: #GH: sig-autoscaling-pr-reviews
+    - DirectXMan12
+    - bskiba
+    - aleksandra-malinowska
+    - MaciekPytel
+    - davidopp
+    - mwielgus
+  sig-aws: #Amazon AWS
+    - justinsb
+    - kris-nova
+    - chrislovecnm
+    - mfburnett
+  sig-azure: #Microsoft Azure
+    - slack
+    - colemickens
+    - jdumars
+  sig-big-data: #GH: sig-big-data-pr-reviews
+    - foxish
+  sig-cli: #Team: CLI; GH: sig-cli-pr-reviews; e.g. kubectl
+    - adohe
+    - deads2k
+    - derekwaynecarr
+    - dims
+    - dshulyak
+    - eparis
+    - ericchiang
+    - ghodss
+    - mengqiy
+    - rootfs
+    - shiywang
+    - smarterclayton
+    - soltysh
+    - sttts
+  sig-cluster-lifecycle: #GH: sig-cluster-lifecycle-pr-reviews
+    - jbeda
+    - timothysc
+    - lukemarsden
+    - pipejakob
+    - dmmcquay
+    - mattmoyer
+    - luxas
+    - roberthbailey
+    - medinatiger
+  sig-cluster-ops:
+    - zehicle
+    - jdumars
+  sig-contribex: #aka Contributor Experience; GH: sig-contributor-experience-pr-reviews
+    - rmmh
+    - cblecker
+    - apelisse
+    - grodrigues3
+    - spxtr
+  sig-contributor-experience: #GH: sig-contributor-experience-pr-reviews
+    - rmmh
+    - cblecker
+    - apelisse
+    - grodrigues3
+    - spxtr
+  sig-docs: #Team: documentation; GH: sig-docs-pr-reviews
+    - a-mccarthy
+    - abiogenesis-now
+    - bradamant3
+    - steveperry-53
+    - zacharysarah
+  sig-federation: #Team: Federation; e.g. Federated Clusters
+    - csbell
+  sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
+    - abgworrall
+  sig-instrumentation: #GH: sig-instrumentation-pr-reviews; e.g. metrics, logging, events
+    - DirectXMan12
+    - x13n
+    - kawych
+    - crassirostris
+    - brancz
+    - fabxc
+    - loburm
+    - piosz
+    - fgrzadkowski
+  sig-multicluster: #GH: sig-multicluster-pr-reviews; e.g. resiliency against availability zone outages; hybrid clouds; spanning multiple cloud providers; migration to public clouds
+    - madhusudancs
+    - marun
+    - jianhuiz
+    - shashidharatd
+    - nikhiljindal
+    - quinton-hoole
+    - mwielgus
+    - csbell
+  sig-network: #Team: Network; GH: sig-network-pr-reviews; e.g. Ingress, Network Policies, Services
+    - bowei
+    - caseydavenport
+    - danwinship
+    - dcbw
+    - dnardo
+    - freehan
+    - mrhohn
+    - nicksardo
+    - thockin
+  sig-node: #Team: Node; GH: sig-node-pr-reviews; e.g. Containers, Docker, Images, OS images, Pods, Registries
+    - Random-Liu
+    - dashpole
+    - dchen1107
+    - derekwaynecarr
+    - dims
+    - feiskyer
+    - mtaufen
+    - ncdc
+    - pmorie
+    - resouer
+    - sjpotter
+    - tallclair
+    - tmrts
+    - vishh
+    - yifan-gu
+    - yujuhong
+  sig-onprem: #On-premises; GH: sig-onprem-pr-reviews
+    - zen
+    - idvoretskyi
+    - pigmej
+    - feiskyer
+    - nebril
+  sig-openstack: #GH: sig-openstack-pr-reviews
+    - idvoretskyi
+    - xsgordon
+    - NickrenREN
+  sig-pm: #aka Product Management
+    - apsinha
+    - idvoretskyi
+    - calebamiles
+  sig-product-management:
+    - apsinha
+    - idvoretskyi
+    - calebamiles
+  sig-release: #GH: sig-release-pr-reviews
+    - calebamiles
+    - enisoc
+    - pwittrock
+  sig-rktnetes:
+    - calebamiles
+  sig-scalability: #GH: sig-scalability-pr-reviews
+    - jbeda
+    - spiffxp
+    - lavalamp
+    - countspongebob
+  sig-scheduling: #Team: Sharing; GH: sig-scheduling-pr-reviews; e.g. Scheduler
+    - bsalamat
+    - davidopp
+    - jayunit100
+    - k82cn
+    - resouer
+    - timothysc
+    - wojtek-t
+  sig-service-catalog: #GH: sig-service-catalog-pr-reviews; e.g. Service Broker
+    - pmorie
+    - jessfraz
+    - pwittrock
+    - droot
+    - seans3
+  sig-storage: #Team: Storage; GH: sig-storage-pr-reviews; e.g. Volumes
+    - childsb
+    - jsafrane
+    - rootfs
+    - saad-ali
+    - matchstick
+    - msau42
+  sig-testing: #GH: sig-testing-pr-reviews
+    - fejta
+    - ixdy
+    - rmmh
+    - spiffxp
+    - spxtr
+  sig-ui: #User Interface
+    - danielromlein
+    - floreks
+  sig-windows:
+    - michmike
+

_config.yml

@@ -27,27 +27,27 @@ defaults:
           version: "v1.9"
           githubbranch: "v1.9.0"
           docsbranch: "release-1.9"
-          url: https://kubernetes.io/docs/home/
+          url: https://kubernetes.io
         - fullversion: "v1.8.4"
           version: "v1.8"
           githubbranch: "v1.8.4"
           docsbranch: "release-1.8"
-          url: https://v1-8.docs.kubernetes.io/docs/home/
+          url: https://v1-8.docs.kubernetes.io
         - fullversion: "v1.7.6"
           version: "v1.7"
           githubbranch: "v1.7.6"
           docsbranch: "release-1.7"
-          url: https://v1-7.docs.kubernetes.io/docs/home/
+          url: https://v1-7.docs.kubernetes.io
         - fullversion: "v1.6.8"
           version: "v1.6"
           githubbranch: "v1.6.8"
           docsbranch: "release-1.6"
-          url: https://v1-6.docs.kubernetes.io/docs/home/
+          url: https://v1-6.docs.kubernetes.io
         - fullversion: "v1.5.7"
           version: "v1.5"
           githubbranch: "v1.5.7"
           docsbranch: "release-1.5"
-          url: https://v1-5.docs.kubernetes.io/docs/
+          url: https://v1-5.docs.kubernetes.io
       deprecated: false
       currentUrl: https://kubernetes.io/docs/home/
       nextUrl: http://kubernetes-io-vnext-staging.netlify.com/

_data/glossary/configmap.yaml

@@ -1,6 +1,6 @@
 id: configmap
 name: ConfigMap
-full-link: /docs/tasks/configure-pod-container/configmap/
+full-link: /docs/tasks/configure-pod-container/configure-pod-configmap/
 related:
 - pod
 - secret

_data/glossary/labels.yaml

@@ -1,9 +1,10 @@
-id: labels
-name: Labels
+id: label
+name: Label
 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.
+  Tags 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.
+  Labels are key/value pairs that are attached to objects such as {% glossary_tooltip text="Pods" term_id="pod" %}.
+  They are used to organize and to select subsets of objects.

_data/glossary/namespace.yaml

@@ -2,8 +2,9 @@ id: namespace
 name: Namespace
 full-link: /docs/concepts/overview/working-with-objects/namespaces
 tags:
-- fundamental
+  - fundamental
 short-description: >
-  An abstraction used by Kubernetes to support 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 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.
+  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.

_data/glossary/persistent-volume-claim.yaml

@@ -0,0 +1,15 @@
+id: persistent-volume-claim
+name: Persistent Volume Claim
+full-link: /docs/concepts/storage/persistent-volumes/
+related:
+- persistent-volume
+- statefulset
+- deployment
+- pod
+tags:
+- core-object
+- storage
+short-description: >
+  Claims storage resources defined in a {% glossary_tooltip text="PersistentVolume (PV)" term_id="persistent-volume" %} so that it can be mounted as a volume in a container.
+long-description: |
+  Specifies the amount of storage, how the storage will be accessed (read-only, read-write and/or exclusive) and how it is reclaimed (retained, recycled or deleted). Details of the storage itself are in the PersistentVolume specification.

_data/glossary/persistent-volume.yaml

@@ -0,0 +1,17 @@
+id: persistent-volume
+name: Persistent Volume
+full-link: /docs/concepts/storage/persistent-volumes/
+related:
+- statefulset
+- deployment
+- persistent-volume-claim
+- pod
+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" %}.
+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).
+  For scenarios that require on-demand storage (dynamic provisioning), PersistentVolumeClaims (PVCs) are used instead.

_data/glossary/secret.yml

@@ -12,4 +12,4 @@ short-description: >
 long-description: >
   Allows for more control over how sensitive information is used and reduces the risk of accidental exposure, including [encryption](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/#ensure-all-secrets-are-encrypted) at rest. 
   A {% glossary_tooltip text="Pod" term_id="pod" %} references the secret as a file in a volume mount or by the kubelet pulling images for a pod.
-  Secrets are great for confidential data and [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configmap/) for non-confidential data.
+  Secrets are great for confidential data and [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) for non-confidential data.

_data/glossary/service-catalog.yaml

@@ -5,4 +5,4 @@ tags:
 short-description: >
   An extension API that enables applications running in Kubernetes clusters to easily use external managed software offerings, such as a datastore service offered by a cloud provider.
 long-description: >
-  Service Catalog provides a way to list, provision, and bind with external {% glossary_tooltip text="Managed Services" term_id="managed-service" %} from {% glossary_tooltip text="Service Brokers" term_id="service-broker" %} without needing detailed knowledge about how those services are created or managed.
+  It provides a way to list, provision, and bind with external {% glossary_tooltip text="Managed Services" term_id="managed-service" %} from {% glossary_tooltip text="Service Brokers" term_id="service-broker" %} without needing detailed knowledge about how those services are created or managed.

_data/tasks.yml

@@ -28,7 +28,6 @@ toc:
   - docs/tasks/configure-pod-container/assign-pods-nodes.md
   - docs/tasks/configure-pod-container/configure-pod-initialization.md
   - docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md
-  - docs/tasks/configure-pod-container/configmap.md
   - docs/tasks/configure-pod-container/configure-pod-configmap.md
   - docs/tools/kompose/user-guide.md