Skip to content

Commit 3d79703

Browse files
Bradamant3zacharysarah
authored and
zacharysarah
committed
merge master to 1.10, with fixes (#7682)
1 parent 7f40782 commit 3d79703

File tree

60 files changed

+59502
-33368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+59502
-33368
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
<<<<<<< HEAD
12
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
23
> For 1.11 Features: set Milestone to 1.11 and Base Branch to release-1.11
34
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
||||||| merged common ancestors
6+
=======
7+
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8+
> For 1.10 Features: set Milestone to 1.10 and Base Branch to release-1.10
9+
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
10+
>>>>>>> merge master to 1.10, with fixes (#7682)
411
> 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.>
512
>
613
> Please delete this note before submitting the pull request.

OWNERS_ALIASES

+5
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,13 @@ aliases:
9090
- bradamant3
9191
- steveperry-53
9292
- zacharysarah
93+
<<<<<<< HEAD
9394
- bradtopol
9495
- heckj
96+
||||||| merged common ancestors
97+
=======
98+
- bradtopol
99+
>>>>>>> merge master to 1.10, with fixes (#7682)
95100
sig-federation: #Team: Federation; e.g. Federated Clusters
96101
- csbell
97102
sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews

_config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ incremental: true
1313
safe: false
1414
lsi: false
1515

16+
<<<<<<< HEAD
1617
latest: "v1.10"
1718

1819
paginate: 7
1920
paginate_path: "/blog/page:num/"
2021

22+
||||||| merged common ancestors
23+
=======
24+
latest: "v1.9"
25+
>>>>>>> merge master to 1.10, with fixes (#7682)
2126
defaults:
2227
-
2328
scope:

_data/docs-home.yml

+5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ toc:
1818
- docs/home/contribute/review-issues.md
1919
- docs/home/contribute/style-guide.md
2020
- docs/home/contribute/includes.md
21+
<<<<<<< HEAD
2122
- docs/home/contribute/localization.md
2223
- docs/home/contribute/blog-post.md
24+
||||||| merged common ancestors
25+
=======
26+
- docs/home/contribute/localization.md
27+
>>>>>>> merge master to 1.10, with fixes (#7682)
2328

2429
- title: Updating Automatically Generated Reference Pages
2530
section:

_data/reference.yml

+5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ toc:
3232
- docs/reference/workloads-18-19.md
3333

3434
- title: API Reference
35+
<<<<<<< HEAD
3536
landing_page: /docs/reference/generated/kubernetes-api/v1.10/
37+
||||||| merged common ancestors
38+
=======
39+
landing_page: /docs/api-reference/v1.8/
40+
>>>>>>> merge master to 1.10, with fixes (#7682)
3641
section:
3742
- title: v1.10
3843
path: /docs/reference/generated/kubernetes-api/v1.10/

_data/setup.yml

+13
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,14 @@ toc:
3232
- docs/getting-started-guides/alternatives.md
3333

3434
- title: Hosted Solutions
35+
<<<<<<< HEAD
3536
landing_page: /docs/setup/pick-right-solution/#hosted-solutions
37+
||||||| merged common ancestors
38+
=======
39+
landing_page: /docs/setup/hosted-solutions/overview/
40+
>>>>>>> merge master to 1.10, with fixes (#7682)
3641
section:
42+
- docs/setup/hosted-solutions/overview.md
3743
- title: Running Kubernetes on Google Kubernetes Engine
3844
path: https://cloud.google.com/kubernetes-engine/docs/before-you-begin/
3945
- title: Running Kubernetes on Azure Container Service
@@ -75,6 +81,13 @@ toc:
7581

7682
- title: Bare Metal
7783
section:
84+
<<<<<<< HEAD
85+
||||||| merged common ancestors
86+
- docs/getting-started-guides/coreos/bare_metal_offline.md
87+
- docs/getting-started-guides/fedora/fedora_ansible_config.md
88+
=======
89+
- docs/getting-started-guides/coreos/bare_metal_offline.md
90+
>>>>>>> merge master to 1.10, with fixes (#7682)
7891
- docs/getting-started-guides/fedora/fedora_manual_config.md
7992
- docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
8093
- docs/getting-started-guides/coreos/index.md

_data/tasks.yml

+6
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,19 @@ toc:
186186
- docs/tasks/administer-cluster/configure-multiple-schedulers.md
187187
- docs/tasks/administer-cluster/ip-masq-agent.md
188188
- docs/tasks/administer-cluster/dns-custom-nameservers.md
189+
<<<<<<< HEAD
189190
<<<<<<< HEAD
190191
- docs/tasks/administer-cluster/dns-debugging-resolution.md
191192
- docs/tasks/administer-cluster/pvc-protection.md
192193
- docs/tasks/administer-cluster/storage-object-in-use-protection.md
193194
||||||| merged common ancestors
194195
- docs/tasks/administer-cluster/pvc-protection.md
195196
=======
197+
||||||| merged common ancestors
198+
=======
199+
- docs/tasks/administer-cluster/dns-debugging-resolution.md
200+
- docs/tasks/administer-cluster/pvc-protection.md
201+
>>>>>>> merge master to 1.10, with fixes (#7682)
196202
- docs/tasks/administer-cluster/storage-object-in-use-protection.md
197203
>>>>>>> add pv protection description (#7620)
198204

_includes/head.html

+18
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@
44
<link rel="shortcut icon" type="image/png" href="/images/favicon.png">
55
<link rel="stylesheet" type="text/css" href="/css/base_fonts.css">
66
{% 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 %}
7+
<<<<<<< HEAD
78
<link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
89
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
10+
||||||| merged common ancestors
11+
<link rel="stylesheet" type="text/css" href="/css/jquery-ui.min.css">
12+
<link rel="stylesheet" type="text/css" href="/css/sweetalert.css">
13+
=======
14+
<link rel="stylesheet" type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
15+
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
16+
>>>>>>> merge master to 1.10, with fixes (#7682)
917
<link rel="stylesheet" type="text/css" href="/css/callouts.css">
1018
<link rel="stylesheet" type="text/css" href="/css/custom-jekyll/tags.css">
1119
{% if page.deprecated %}<link rel="stylesheet" type="text/css" href="/css/deprecation-warning.css">{% endif %}
@@ -19,6 +27,7 @@
1927
<meta name="description" content="{{ page.title }}" />
2028
{% endif %}
2129

30+
<<<<<<< HEAD
2231
<script
2332
src="https://code.jquery.com/jquery-3.2.1.min.js"
2433
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
@@ -29,6 +38,15 @@
2938
crossorigin="anonymous"></script>
3039
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
3140
<script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
41+
||||||| merged common ancestors
42+
<script src="/js/jquery-2.2.0.min.js"></script>
43+
<script src="/js/jquery-ui.min.js"></script>
44+
=======
45+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
46+
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
47+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
48+
<script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
49+
>>>>>>> merge master to 1.10, with fixes (#7682)
3250
<script src="/js/script.js"></script>
3351
<script src="/js/custom-jekyll/tags.js"></script>
3452
{% if page.js %}{% assign jslist = page.js | split: ',' | compact %}{% for jsurl in jslist %}<script src="{{ jsurl | strip }}"></script>

_includes/partner-script.js

+172
Original file line numberDiff line numberDiff line change
@@ -1206,6 +1206,7 @@
12061206
},
12071207
{
12081208
type: 0,
1209+
<<<<<<< HEAD
12091210
name: 'CloudBourne',
12101211
logo: 'cloudbourne',
12111212
link: 'https://cloudbourne.com/',
@@ -1458,6 +1459,177 @@
14581459
},
14591460
{
14601461
type: 0,
1462+
||||||| merged common ancestors
1463+
=======
1464+
name: 'CloudBourne',
1465+
logo: 'cloudbourne',
1466+
link: 'https://cloudbourne.com/',
1467+
blurb: 'Our AppZ Hybrid Cloud Platform can help you achieve your digital transformation goals using the powerful Kubernetes.'
1468+
},
1469+
{
1470+
type: 3,
1471+
name: 'BoCloud',
1472+
logo: 'bocloud',
1473+
link: 'http://www.bocloud.com.cn/en/index.html',
1474+
blurb: 'BoCloud - BeyondcentContainer'
1475+
},
1476+
{
1477+
type: 2,
1478+
name: 'Naitways',
1479+
logo: 'naitways',
1480+
link: 'https://www.naitways.com/',
1481+
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.'
1482+
},
1483+
{
1484+
type: 2,
1485+
name: 'Kinvolk',
1486+
logo: 'kinvolk',
1487+
link: 'https://kinvolk.io/kubernetes/',
1488+
blurb: 'Kinvolk offers Kubernetes engineering & operations support from cluster to kernel. Leading cloud-native organizations turn to Kinvolk for deep-stack Linux expertise.'
1489+
},
1490+
{
1491+
type: 1,
1492+
name: 'Cascadeo Corporation',
1493+
logo: 'cascadeo',
1494+
link: 'http://www.cascadeo.com/',
1495+
blurb: 'Cascadeo designs, implements, and manages containerized workloads with Kubernetes, for both existing applications and greenfield development projects.'
1496+
},
1497+
{
1498+
type: 1,
1499+
name: 'Elastisys AB',
1500+
logo: 'elastisys',
1501+
link: 'https://elastisys.com/services/#kubernetes',
1502+
blurb: 'We design, build, and operate Kubernetes clusters. We are experts in highly available and self-optimizing Kubernetes infrastructures'
1503+
},
1504+
{
1505+
type: 1,
1506+
name: 'Greenfield Guild',
1507+
logo: 'greenfield',
1508+
link: 'http://greenfieldguild.com/',
1509+
blurb: 'The Greenfield Guild builds quality open source solutions on, and offers training and support for, Kubernetes in any environment.'
1510+
},
1511+
{
1512+
type: 1,
1513+
name: 'PolarSeven',
1514+
logo: 'polarseven',
1515+
link: 'https://polarseven.com/what-we-do/kubernetes/',
1516+
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.'
1517+
},
1518+
{
1519+
type: 1,
1520+
name: 'Kloia',
1521+
logo: 'kloia',
1522+
link: 'https://devops-as-a-service.kloia.com/',
1523+
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.'
1524+
},
1525+
{
1526+
type: 0,
1527+
name: 'Bluefyre',
1528+
logo: 'bluefyre',
1529+
link: 'https://www.bluefyre.io',
1530+
blurb: 'Bluefyre offers a developer-first security platform that is native to Kubernetes. Bluefyre helps your development team ship secure code on Kubernetes faster!'
1531+
},
1532+
{
1533+
type: 0,
1534+
name: 'Harness',
1535+
logo: 'harness',
1536+
link: 'https://harness.io/harness-continuous-delivery/secret-sauce/smart-automation/',
1537+
blurb: 'Harness offers Continuous Delivery As-A-Service will full support for containerized apps and Kubernetes clusters.'
1538+
},
1539+
{
1540+
type: 0,
1541+
name: 'VMware - Wavefront',
1542+
logo: 'wavefront',
1543+
link: 'https://www.wavefront.com/solutions/container-monitoring/',
1544+
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.'
1545+
},
1546+
{
1547+
type: 0,
1548+
name: 'Bloombase, Inc.',
1549+
logo: 'bloombase',
1550+
link: 'https://www.bloombase.com/go/kubernetes',
1551+
blurb: 'Bloombase provides high bandwidth, defense-in-depth data-at-rest encryption to lock down Kubernetes crown-jewels at scale.'
1552+
},
1553+
{
1554+
type: 0,
1555+
name: 'Kloia',
1556+
logo: 'kloia',
1557+
link: 'https://docs.codefresh.io/docs/codefresh-kubernetes-integration-beta',
1558+
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.'
1559+
},
1560+
{
1561+
type: 0,
1562+
name: 'Kasten',
1563+
logo: 'kasten',
1564+
link: 'https://kasten.io/product/',
1565+
blurb: 'Kasten provides enterprise solutions specifically built to address the operational complexity of data management in cloud-native environments.'
1566+
},
1567+
{
1568+
type: 0,
1569+
name: 'Humio',
1570+
logo: 'humio',
1571+
link: 'https://humio.com',
1572+
blurb: 'Humio is a log aggregation database. We offer a Kubernetes integration that will give you insights to your logs across apps and instances.'
1573+
},
1574+
{
1575+
type: 0,
1576+
name: 'Outcold Solutions LLC',
1577+
logo: 'outcold',
1578+
link: 'https://www.outcoldsolutions.com/#monitoring-kubernetes',
1579+
blurb: 'Powerful Certified Splunk applications for Monitoring OpenShift, Kubernetes and Docker.'
1580+
},
1581+
{
1582+
type: 0,
1583+
name: 'SysEleven GmbH',
1584+
logo: 'syseleven',
1585+
link: 'http://www.syseleven.de/',
1586+
blurb: 'Enterprise Customers who are in need of bulletproof operations (High Performance E-Commerce and Enterprise Portals)'
1587+
},
1588+
{
1589+
type: 0,
1590+
name: 'Landoop',
1591+
logo: 'landoop',
1592+
link: 'http://lenses.stream',
1593+
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.'
1594+
},
1595+
{
1596+
type: 0,
1597+
name: 'Redis Labs',
1598+
logo: 'redis',
1599+
link: 'https://redislabs.com/blog/getting-started-with-kubernetes-and-redis-using-redis-enterprise/',
1600+
blurb: 'Redis Enterprise extends open source Redis and delivers stable high performance and linear scaling required for building microservices on the Kubernetes platform.'
1601+
},
1602+
{
1603+
type: 3,
1604+
name: 'Diamanti',
1605+
logo: 'diamanti',
1606+
link: 'https://diamanti.com/',
1607+
blurb: 'Diamanti - Diamanti-D10'
1608+
},
1609+
{
1610+
type: 3,
1611+
name: 'Eking',
1612+
logo: 'eking',
1613+
link: 'http://www.eking-tech.com/',
1614+
blurb: 'Hainan eKing Technology Co. - eKing Cloud Container Platform'
1615+
},
1616+
{
1617+
type: 3,
1618+
name: 'Harmony Cloud',
1619+
logo: 'harmony',
1620+
link: 'http://harmonycloud.cn/products/rongqiyun/',
1621+
blurb: 'Harmonycloud - Harmonycloud Container Platform'
1622+
},
1623+
{
1624+
type: 3,
1625+
name: 'ZTE',
1626+
logo: 'zte',
1627+
link: 'https://sdnfv.zte.com.cn/zh-CN/home',
1628+
blurb: 'ZTE - TECS OpenPalette'
1629+
},
1630+
{
1631+
type: 0,
1632+
>>>>>>> merge master to 1.10, with fixes (#7682)
14611633
name: 'Logdna',
14621634
logo: 'logdna',
14631635
link: 'https://logdna.com/kubernetes',

0 commit comments

Comments
 (0)