merge master to 1.10, with fixes (#7682)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,13 @@
+<<<<<<< HEAD
 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 > For 1.11 Features: set Milestone to 1.11 and Base Branch to release-1.11
 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+||||||| merged common ancestors
+=======
+>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> For 1.10 Features: set Milestone to 1.10 and Base Branch to release-1.10
+>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>>>>>>> merge master to 1.10, with fixes (#7682)
 > 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.

OWNERS_ALIASES

@@ -90,8 +90,13 @@ aliases:
     - bradamant3
     - steveperry-53
     - zacharysarah
+<<<<<<< HEAD
     - bradtopol
     - heckj
+||||||| merged common ancestors
+=======
+    - bradtopol
+>>>>>>> merge master to 1.10, with fixes (#7682)
   sig-federation: #Team: Federation; e.g. Federated Clusters
     - csbell
   sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews

_config.yml

@@ -13,11 +13,16 @@ incremental: true
 safe: false
 lsi: false
 
+<<<<<<< HEAD
 latest: "v1.10"
 
 paginate: 7
 paginate_path: "/blog/page:num/"
 
+||||||| merged common ancestors
+=======
+latest: "v1.9"
+>>>>>>> merge master to 1.10, with fixes (#7682)
 defaults:
   -
     scope:

_data/docs-home.yml

@@ -18,8 +18,13 @@ toc:
   - docs/home/contribute/review-issues.md
   - docs/home/contribute/style-guide.md
   - docs/home/contribute/includes.md
+<<<<<<< HEAD
   - docs/home/contribute/localization.md
   - docs/home/contribute/blog-post.md
+||||||| merged common ancestors
+=======
+  - docs/home/contribute/localization.md
+>>>>>>> merge master to 1.10, with fixes (#7682)
 
   - title: Updating Automatically Generated Reference Pages
     section:

_data/reference.yml

@@ -32,7 +32,12 @@ toc:
   - docs/reference/workloads-18-19.md
 
 - title: API Reference
+<<<<<<< HEAD
   landing_page: /docs/reference/generated/kubernetes-api/v1.10/
+||||||| merged common ancestors
+=======
+  landing_page: /docs/api-reference/v1.8/
+>>>>>>> merge master to 1.10, with fixes (#7682)
   section:
   - title: v1.10
     path: /docs/reference/generated/kubernetes-api/v1.10/

_data/setup.yml

@@ -32,8 +32,14 @@ toc:
   - docs/getting-started-guides/alternatives.md
 
 - title: Hosted Solutions
+<<<<<<< HEAD
   landing_page: /docs/setup/pick-right-solution/#hosted-solutions
+||||||| merged common ancestors
+=======
+  landing_page: /docs/setup/hosted-solutions/overview/
+>>>>>>> merge master to 1.10, with fixes (#7682)
   section:
+  - docs/setup/hosted-solutions/overview.md
   - title: Running Kubernetes on Google Kubernetes Engine
     path: https://cloud.google.com/kubernetes-engine/docs/before-you-begin/
   - title: Running Kubernetes on Azure Container Service
@@ -75,6 +81,13 @@ toc:
 
     - title: Bare Metal
       section:
+<<<<<<< HEAD
+||||||| merged common ancestors
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+      - docs/getting-started-guides/fedora/fedora_ansible_config.md
+=======
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+>>>>>>> merge master to 1.10, with fixes (#7682)
       - docs/getting-started-guides/fedora/fedora_manual_config.md
       - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
       - docs/getting-started-guides/coreos/index.md

_data/tasks.yml

@@ -186,13 +186,19 @@ toc:
   - docs/tasks/administer-cluster/configure-multiple-schedulers.md
   - docs/tasks/administer-cluster/ip-masq-agent.md
   - docs/tasks/administer-cluster/dns-custom-nameservers.md
+<<<<<<< HEAD
 <<<<<<< HEAD
   - docs/tasks/administer-cluster/dns-debugging-resolution.md
   - docs/tasks/administer-cluster/pvc-protection.md
   - docs/tasks/administer-cluster/storage-object-in-use-protection.md
 ||||||| merged common ancestors
   - docs/tasks/administer-cluster/pvc-protection.md
 =======
+||||||| merged common ancestors
+=======
+  - docs/tasks/administer-cluster/dns-debugging-resolution.md
+  - docs/tasks/administer-cluster/pvc-protection.md
+>>>>>>> merge master to 1.10, with fixes (#7682)
   - docs/tasks/administer-cluster/storage-object-in-use-protection.md
 >>>>>>> add pv protection description (#7620)
 

_includes/head.html

@@ -4,8 +4,16 @@
     <link rel="shortcut icon" type="image/png" href="/images/favicon.png">
     <link rel="stylesheet" type="text/css" href="/css/base_fonts.css">
     {% if page.case_study_styles %}<link rel="stylesheet" type="text/css" href="/css/case_study_styles.css"><!-- custom case_study_styles on -->{% else %}<link rel="stylesheet" type="text/css" href="/css/styles.css"><!-- default styles.css on -->{% endif %}
+<<<<<<< HEAD
     <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
+||||||| merged common ancestors
+    <link rel="stylesheet" type="text/css" href="/css/jquery-ui.min.css">
+    <link rel="stylesheet" type="text/css" href="/css/sweetalert.css">
+=======
+    <link rel="stylesheet" type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
+>>>>>>> merge master to 1.10, with fixes (#7682)
     <link rel="stylesheet" type="text/css" href="/css/callouts.css">
     <link rel="stylesheet" type="text/css" href="/css/custom-jekyll/tags.css">
     {% if page.deprecated %}<link rel="stylesheet" type="text/css" href="/css/deprecation-warning.css">{% endif %}
@@ -19,6 +27,7 @@
     <meta name="description" content="{{ page.title }}" />
     {% endif %}
 
+<<<<<<< HEAD
     <script
       src="https://code.jquery.com/jquery-3.2.1.min.js"
       integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
@@ -29,6 +38,15 @@
       crossorigin="anonymous"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
+||||||| merged common ancestors
+    <script src="/js/jquery-2.2.0.min.js"></script>
+    <script src="/js/jquery-ui.min.js"></script>
+=======
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
+>>>>>>> merge master to 1.10, with fixes (#7682)
     <script src="/js/script.js"></script>
     <script src="/js/custom-jekyll/tags.js"></script>
     {% if page.js %}{% assign jslist = page.js | split: ',' | compact %}{% for jsurl in jslist %}<script src="{{ jsurl | strip }}"></script>

_includes/partner-script.js

@@ -1206,6 +1206,7 @@
 				},
 		{
 			type: 0,
+<<<<<<< HEAD
 			name: 'CloudBourne',
 			logo: 'cloudbourne',
 			link: 'https://cloudbourne.com/',
@@ -1458,6 +1459,177 @@
 				},
 		{
 			type: 0,
+||||||| merged common ancestors
+=======
+			name: 'CloudBourne',
+			logo: 'cloudbourne',
+			link: 'https://cloudbourne.com/',
+			blurb: 'Our AppZ Hybrid Cloud Platform can help you achieve your digital transformation goals using the powerful Kubernetes.'
+				},
+		{
+			type: 3,
+			name: 'BoCloud',
+			logo: 'bocloud',
+			link: 'http://www.bocloud.com.cn/en/index.html',
+			blurb: 'BoCloud - BeyondcentContainer'
+				},
+		{
+			type: 2,
+			name: 'Naitways',
+			logo: 'naitways',
+			link: 'https://www.naitways.com/',
+			blurb: 'Naitways is an Operator (AS57119), Integrator and Cloud Services Provider (our own !). We aim to provide value-added services through our mastering of the whole value chain (Infrastructure, Network, Human skills). Private and Public Cloud is available through Kubernetes managed or unmanaged.'
+				},
+		{
+			type: 2,
+			name: 'Kinvolk',
+			logo: 'kinvolk',
+			link: 'https://kinvolk.io/kubernetes/',
+			blurb: 'Kinvolk offers Kubernetes engineering & operations support from cluster to kernel. Leading cloud-native organizations turn to Kinvolk for deep-stack Linux expertise.'
+				},
+		{
+			type: 1,
+			name: 'Cascadeo Corporation',
+			logo: 'cascadeo',
+			link: 'http://www.cascadeo.com/',
+			blurb: 'Cascadeo designs, implements, and manages containerized workloads with Kubernetes, for both existing applications and greenfield development projects.'
+				},
+		{
+			type: 1,
+			name: 'Elastisys AB',
+			logo: 'elastisys',
+			link: 'https://elastisys.com/services/#kubernetes',
+			blurb: 'We design, build, and operate Kubernetes clusters. We are experts in highly available and self-optimizing Kubernetes infrastructures'
+				},
+		{
+			type: 1,
+			name: 'Greenfield Guild',
+			logo: 'greenfield',
+			link: 'http://greenfieldguild.com/',
+			blurb: 'The Greenfield Guild builds quality open source solutions on, and offers training and support for, Kubernetes in any environment.'
+				},
+		{
+			type: 1,
+			name: 'PolarSeven',
+			logo: 'polarseven',
+			link: 'https://polarseven.com/what-we-do/kubernetes/',
+			blurb: 'To get started up and running with Kubernetes (K8s) our PolarSeven consultants can help you with creating a fully functional dockerized environment to run and deploy your applications.'
+				},
+		{
+			type: 1,
+			name: 'Kloia',
+			logo: 'kloia',
+			link: 'https://devops-as-a-service.kloia.com/',
+			blurb: 'Kloia is DevOps and Microservices Consultancy company that helps its customers to migrate their environment to cloud platforms for enabling more scalable and secure environments. We use Kubernetes to provide our customers all-in-one solutions in an cloud-agnostic way.'
+				},
+		{
+			type: 0,
+			name: 'Bluefyre',
+			logo: 'bluefyre',
+			link: 'https://www.bluefyre.io',
+			blurb: 'Bluefyre offers a developer-first security platform that is native to Kubernetes. Bluefyre helps your development team ship secure code on Kubernetes faster!'
+				},
+		{
+			type: 0,
+			name: 'Harness',
+			logo: 'harness',
+			link: 'https://harness.io/harness-continuous-delivery/secret-sauce/smart-automation/',
+			blurb: 'Harness offers Continuous Delivery As-A-Service will full support for containerized apps and Kubernetes clusters.'
+				},
+		{
+			type: 0,
+			name: 'VMware - Wavefront',
+			logo: 'wavefront',
+			link: 'https://www.wavefront.com/solutions/container-monitoring/',
+			blurb: 'The Wavefront platform provides metrics-driven analytics and monitoring for  Kubernetes and container dashboards for DevOps and developer teams delivering visibility into high-level services as well as granular container metrics.'
+				},
+		{
+			type: 0,
+			name: 'Bloombase, Inc.',
+			logo: 'bloombase',
+			link: 'https://www.bloombase.com/go/kubernetes',
+			blurb: 'Bloombase provides high bandwidth, defense-in-depth data-at-rest encryption to lock down Kubernetes crown-jewels at scale.'
+				},
+		{
+			type: 0,
+			name: 'Kloia',
+			logo: 'kloia',
+			link: 'https://docs.codefresh.io/docs/codefresh-kubernetes-integration-beta',
+			blurb: 'Kloia is DevOps and Microservices Consultancy company that helps its customers to migrate their environment to cloud platforms for enabling more scalable and secure environments. We use Kubernetes to provide our customers all-in-one solutions in an cloud-agnostic way.'
+				},
+		{
+			type: 0,
+			name: 'Kasten',
+			logo: 'kasten',
+			link: 'https://kasten.io/product/',
+			blurb: 'Kasten provides enterprise solutions specifically built to address the operational complexity of data management in cloud-native environments.'
+				},
+		{
+			type: 0,
+			name: 'Humio',
+			logo: 'humio',
+			link: 'https://humio.com',
+			blurb: 'Humio is a log aggregation database. We offer a Kubernetes integration that will give you insights to your logs across apps and instances.'
+				},
+		{
+			type: 0,
+			name: 'Outcold Solutions LLC',
+			logo: 'outcold',
+			link: 'https://www.outcoldsolutions.com/#monitoring-kubernetes',
+			blurb: 'Powerful Certified Splunk applications for Monitoring OpenShift, Kubernetes and Docker.'
+				},
+		{
+			type: 0,
+			name: 'SysEleven GmbH',
+			logo: 'syseleven',
+			link: 'http://www.syseleven.de/',
+			blurb: 'Enterprise Customers who are in need of bulletproof operations (High Performance E-Commerce and Enterprise Portals)'
+				},
+		{
+			type: 0,
+			name: 'Landoop',
+			logo: 'landoop',
+			link: 'http://lenses.stream',
+			blurb: 'Lenses for Apache Kafka, to deploy, manage and operate with confidence data streaming pipelines and topologies at scale with confidence and native Kubernetes integration.'
+				},
+		{
+			type: 0,
+			name: 'Redis Labs',
+			logo: 'redis',
+			link: 'https://redislabs.com/blog/getting-started-with-kubernetes-and-redis-using-redis-enterprise/',
+			blurb: 'Redis Enterprise extends open source Redis and delivers stable high performance and linear scaling required for building microservices on the Kubernetes platform.'
+				},
+		{
+			type: 3,
+			name: 'Diamanti',
+			logo: 'diamanti',
+			link: 'https://diamanti.com/',
+			blurb: 'Diamanti - Diamanti-D10'
+				},
+		{
+			type: 3,
+			name: 'Eking',
+			logo: 'eking',
+			link: 'http://www.eking-tech.com/',
+			blurb: 'Hainan eKing Technology Co. - eKing Cloud Container Platform'
+				},
+		{
+			type: 3,
+			name: 'Harmony Cloud',
+			logo: 'harmony',
+			link: 'http://harmonycloud.cn/products/rongqiyun/',
+			blurb: 'Harmonycloud - Harmonycloud Container Platform'
+				},
+		{
+			type: 3,
+			name: 'ZTE',
+			logo: 'zte',
+			link: 'https://sdnfv.zte.com.cn/zh-CN/home',
+			blurb: 'ZTE - TECS OpenPalette'
+				},
+		{
+			type: 0,
+>>>>>>> merge master to 1.10, with fixes (#7682)
 			name: 'Logdna',
 			logo: 'logdna',
 			link: 'https://logdna.com/kubernetes',