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

* 'master' of https://github.com/kubernetes/website: (549 commits)
  Update service.md (#7810)
  Prune inactive maintainers (#7830)
  add Amadeus to index page and add feature image (#7827)
  Update conventions.md (#7668)
  Adding Tenxcloud as KCSP and Hedvig typo (#7826)
  Update outdated documentation about secret key validation. (#7675)
  Update imperative-command.md (#7699)
  Update manage-deployment.md (#7774)
  Add the OCI runtime description. (#7769)
  fix flag (#7814)
  fix flag (#7813)
  Add files via upload (#7816)
  Remove CoreOS guide that use Kubernetes v0.15.0 (#7821)
  "Nagions" should be "Nagios“ (#7762)
  Update docker-cli-to-kubectl.md (#7748)
  adjust a note format (#7812)
  add a note when mount a configmap to pod (#7745)
  Make using sysctls a task instead of a concept (#6808)
  Partners page updates (#7802)
  Fix a missing word in endpoint reconciler section (#7804)
  ...

Author: chenopis

.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:-->

.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.

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"

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

OWNERS

@@ -1,6 +1,11 @@
 reviewers:
-- a-mccarthy
-- abiogenesis-now
+- tengqm
+- zhangxiaoyu-zidif
+- xiangpengzhao
+approvers:
+- heckj
 - bradamant3
+- bradtopol
 - steveperry-53
 - zacharysarah
+- chenopis

OWNERS_ALIASES

@@ -87,11 +87,11 @@ aliases:
     - grodrigues3
     - spxtr
   sig-docs: #Team: documentation; GH: sig-docs-pr-reviews
-    - a-mccarthy
-    - abiogenesis-now
     - bradamant3
     - steveperry-53
     - zacharysarah
+    - bradtopol
+    - heckj
   sig-federation: #Team: Federation; e.g. Federated Clusters
     - csbell
   sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
@@ -149,9 +149,9 @@ aliases:
     - feiskyer
     - nebril
   sig-openstack: #GH: sig-openstack-pr-reviews
-    - idvoretskyi
-    - xsgordon
-    - NickrenREN
+    - hogepodge
+    - dklyle
+    - rjmorse
   sig-pm: #aka Product Management
     - apsinha
     - idvoretskyi
@@ -203,4 +203,3 @@ aliases:
     - floreks
   sig-windows:
     - michmike
-

_config.yml

@@ -13,6 +13,7 @@ incremental: true
 safe: false
 lsi: false
 
+latest: "v1.9"
 defaults:
   -
     scope:
@@ -88,3 +89,4 @@ tocs:
   - reference
   - samples
   - search
+  - imported

_data/concepts.yml

@@ -1,28 +1,38 @@
 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
+  - docs/concepts/overview/kubernetes-api.md
   - title: Working with Kubernetes Objects
     section:
     - docs/concepts/overview/working-with-objects/kubernetes-objects.md
     - docs/concepts/overview/working-with-objects/names.md
     - docs/concepts/overview/working-with-objects/namespaces.md
     - docs/concepts/overview/working-with-objects/labels.md
     - docs/concepts/overview/working-with-objects/annotations.md
-  - docs/concepts/overview/kubernetes-api.md
+  - title: Object Management Using kubectl
+    section:
+    - docs/concepts/overview/object-management-kubectl/overview.md
+    - docs/concepts/overview/object-management-kubectl/imperative-command.md
+    - docs/concepts/overview/object-management-kubectl/imperative-config.md
+    - 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
@@ -33,16 +43,17 @@ toc:
     section:
     - docs/concepts/cluster-administration/network-plugins.md
     - docs/concepts/cluster-administration/device-plugins.md
-    - docs/concepts/cluster-administration/sysctl-cluster.md
   - 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:
@@ -64,6 +75,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
@@ -74,6 +86,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
@@ -83,13 +96,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
@@ -110,5 +125,3 @@ toc:
     section:
     - docs/concepts/policy/resource-quotas.md
     - docs/concepts/policy/pod-security-policy.md
-
-

_data/docs-home.yml

@@ -1,22 +1,28 @@
-bigheader: "Documentation Home"
+bigheader: "About"
 abstract: "Documentation for using and learning about Kubernetes."
 toc:
 - docs/home/index.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:
+    - docs/home/contribute/generated-reference/kubernetes-components.md
+    - docs/home/contribute/generated-reference/kubectl.md
+    - docs/home/contribute/generated-reference/kubernetes-api.md
+    - docs/home/contribute/generated-reference/federation-api.md

_data/globals.yml

@@ -8,3 +8,4 @@ tocs:
 - reference
 - samples
 - support
+- imported