diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3255f4d853..f12b09a872 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.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.
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 17e50de756..75cde3f87e 100644
--- a/OWNERS_ALIASES
+++ b/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
diff --git a/_config.yml b/_config.yml
index 2fe87ddc32..4a675c259d 100644
--- a/_config.yml
+++ b/_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:
diff --git a/_data/docs-home.yml b/_data/docs-home.yml
index a0b66d11e2..89d53e20b1 100644
--- a/_data/docs-home.yml
+++ b/_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:
diff --git a/_data/reference.yml b/_data/reference.yml
index 26235edabf..1d09a6b564 100644
--- a/_data/reference.yml
+++ b/_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/
diff --git a/_data/setup.yml b/_data/setup.yml
index f09b31417d..86316c794b 100644
--- a/_data/setup.yml
+++ b/_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
diff --git a/_data/tasks.yml b/_data/tasks.yml
index 4b8996ebeb..d3ca879880 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -186,6 +186,7 @@ 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
@@ -193,6 +194,11 @@ toc:
||||||| 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)
diff --git a/_includes/head.html b/_includes/head.html
index 624f7dd925..cc9e9463b6 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -4,8 +4,16 @@
{% if page.case_study_styles %}{% else %}{% endif %}
+<<<<<<< HEAD
+||||||| merged common ancestors
+
+
+=======
+
+
+>>>>>>> merge master to 1.10, with fixes (#7682)
{% if page.deprecated %}{% endif %}
@@ -19,6 +27,7 @@
{% endif %}
+<<<<<<< HEAD
+||||||| merged common ancestors
+
+
+=======
+
+
+
+
+>>>>>>> merge master to 1.10, with fixes (#7682)
{% if page.js %}{% assign jslist = page.js | split: ',' | compact %}{% for jsurl in jslist %}
diff --git a/_includes/partner-script.js b/_includes/partner-script.js
index 9041a5617f..0a9fd613cb 100644
--- a/_includes/partner-script.js
+++ b/_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',
diff --git a/_layouts/docsportal.html b/_layouts/docsportal.html
index acb7efdc75..c2d20ea46c 100644
--- a/_layouts/docsportal.html
+++ b/_layouts/docsportal.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
@@ -64,3 +65,72 @@