Skip to content

Commit d65ea92

Browse files
author
JENNIFER RONDEAU
committed
Merge remote-tracking branch 'upstream/master' into release-1.10
2 parents 08a8807 + 789f8f1 commit d65ea92

25 files changed

+227
-110
lines changed

_data/concepts.yml

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ toc:
4343
section:
4444
- docs/concepts/cluster-administration/network-plugins.md
4545
- docs/concepts/cluster-administration/device-plugins.md
46-
- docs/concepts/cluster-administration/sysctl-cluster.md
4746
- docs/concepts/service-catalog/index.md
4847

4948
- title: Containers

_data/tasks.yml

+1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ toc:
144144
- docs/tasks/administer-cluster/access-cluster-api.md
145145
- docs/tasks/administer-cluster/access-cluster-services.md
146146
- docs/tasks/administer-cluster/securing-a-cluster.md
147+
- docs/tasks/administer-cluster/sysctl-cluster.md
147148
- docs/tasks/administer-cluster/encrypt-data.md
148149
- docs/tasks/administer-cluster/configure-upgrade-etcd.md
149150
- docs/tasks/administer-cluster/static-pod.md

_includes/partner-script.js

+117-19
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
name: 'Spotinst',
209209
logo: 'spotinst',
210210
link: 'http://blog.spotinst.com/2016/08/04/elastigroup-kubernetes-minions-steroids/',
211-
blurb: 'Spotinst uses a prediction algorithm in the Amazon EC2 Spot allowing k8s clusters to increase performance and lower the infrastructure costs'
211+
blurb: 'Your Kubernetes For 80% Less. Run K8s workloads on Spot Instances with 100% availability to save 80% + autoscale your Kubernetes with maximum efficiency in heterogenous environments.'
212212
},
213213
{
214214
type: 2,
@@ -217,12 +217,12 @@
217217
link: 'http://www.inwinstack.com/index.php/en/solutions-en/',
218218
blurb: 'Our container service leverages OpenStack-based infrastructure and its container orchestration engine Magnum to manage Kubernetes clusters.'
219219
},
220-
{
221-
type: 3,
222-
name: 'InwinSTACK',
223-
logo: 'inwinstack',
224-
link: 'https://github.com/inwinstack/kube-ansible',
225-
blurb: 'inwinSTACK - kube-ansible'
220+
{
221+
type: 3,
222+
name: 'InwinSTACK',
223+
logo: 'inwinstack',
224+
link: 'https://github.com/inwinstack/kube-ansible',
225+
blurb: 'inwinSTACK - kube-ansible'
226226
},
227227
{
228228
type: 1,
@@ -281,11 +281,11 @@
281281
blurb: 'CloudPlex enables operations teams to visually deploy, orchestrate, manage, and monitor infrastructure, applications, and services in public or private cloud.'
282282
},
283283
{
284-
type: 1,
284+
type: 2,
285285
name: 'Kumina',
286286
logo: 'kumina',
287287
link: 'https://www.kumina.nl/managed_kubernetes',
288-
blurb: 'Kumina creates Kubernetes solutions on your choice of infrastructure with around-the-clock management and unlimited support.'
288+
blurb: 'Kumina combines the power of Kubernetes with 10+ years of experience in IT operations. We create, build and support fully managed Kubernetes solutions on your choice of infrastructure. We also provide consulting and training.'
289289
},
290290
{
291291
type: 0,
@@ -360,7 +360,7 @@
360360
{
361361
type: 0,
362362
name: 'Mashape, Inc.',
363-
logo: 'mashape',
363+
logo: 'kong',
364364
link: 'https://getkong.org/install/kubernetes/',
365365
blurb: 'Kong is a scalable open source API layer that runs in front of any RESTful API and can be provisioned to a Kubernetes cluster.'
366366
},
@@ -728,6 +728,13 @@
728728
link: 'https://cloud.google.com/kubernetes-engine/',
729729
blurb: 'Google - Google Kubernetes Engine'
730730
},
731+
{
732+
type: 1,
733+
name: 'Superorbital',
734+
logo: 'superorbital',
735+
link: 'https://superorbit.al/workshops/kubernetes/',
736+
blurb: 'Helping companies navigate the Cloud Native waters through Kubernetes consulting and training.'
737+
},
731738
{
732739
type: 3,
733740
name: 'Apprenda',
@@ -1071,6 +1078,13 @@
10711078
link: 'http://www.alauda.cn/product/detail/id/68.html',
10721079
blurb: 'Alauda - Alauda EE'
10731080
},
1081+
{
1082+
type: 2,
1083+
name: 'Alauda',
1084+
logo: 'alauda',
1085+
link: 'www.alauda.io',
1086+
blurb: 'Alauda provides Kubernetes-Centric Enterprise Platform-as-a-Service offerings with a razor focus on delivering Cloud Native capabilities and DevOps best practices to enterprise customers across industries in China.'
1087+
},
10741088
{
10751089
type: 3,
10761090
name: 'EasyStack',
@@ -1243,7 +1257,7 @@
12431257
type: 1,
12441258
name: 'Kloia',
12451259
logo: 'kloia',
1246-
link: 'https://devops-as-a-service.kloia.com/',
1260+
link: 'https://kloia.com/kubernetes/',
12471261
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.'
12481262
},
12491263
{
@@ -1274,13 +1288,6 @@
12741288
link: 'https://www.bloombase.com/go/kubernetes',
12751289
blurb: 'Bloombase provides high bandwidth, defense-in-depth data-at-rest encryption to lock down Kubernetes crown-jewels at scale.'
12761290
},
1277-
{
1278-
type: 0,
1279-
name: 'Kloia',
1280-
logo: 'kloia',
1281-
link: 'https://docs.codefresh.io/docs/codefresh-kubernetes-integration-beta',
1282-
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.'
1283-
},
12841291
{
12851292
type: 0,
12861293
name: 'Kasten',
@@ -1344,13 +1351,104 @@
13441351
link: 'http://harmonycloud.cn/products/rongqiyun/',
13451352
blurb: 'Harmonycloud - Harmonycloud Container Platform'
13461353
},
1354+
{
1355+
type: 3,
1356+
name: 'Woqutech',
1357+
logo: 'woqutech',
1358+
link: 'http://www.woqutech.com/product/product-16-247.html#sss',
1359+
blurb: 'Woqutech - QFusion'
1360+
},
1361+
{
1362+
type: 3,
1363+
name: 'Baidu',
1364+
logo: 'baidu',
1365+
link: 'https://cloud.baidu.com/product/cce.html',
1366+
blurb: 'Baidu Cloud - Baidu Cloud Container Engine'
1367+
},
13471368
{
13481369
type: 3,
13491370
name: 'ZTE',
13501371
logo: 'zte',
1351-
link: 'https://sdnfv.zte.com.cn/zh-CN/home',
1372+
link: 'https://sdnfv.zte.com.cn/en/home',
13521373
blurb: 'ZTE - TECS OpenPalette'
13531374
},
1375+
{
1376+
type: 1,
1377+
name: 'Automatic Server AG',
1378+
logo: 'asag',
1379+
link: 'http://www.automatic-server.com/paas.html',
1380+
blurb: 'We install and operate Kubernetes in big enterprises, create deployment workflows and help to migrate.'
1381+
},
1382+
{
1383+
type: 1,
1384+
name: 'Circulo Siete',
1385+
logo: 'circulo',
1386+
link: 'https://circulosiete.com/consultoria/kubernetes/',
1387+
blurb: 'We are a Mexico based company offering training, consulting and support to migrate your workloads to Kubernetes, Cloud Native Microservices & Devops.'
1388+
},
1389+
{
1390+
type: 1,
1391+
name: 'DevOpsGuru',
1392+
logo: 'devopsguru',
1393+
link: 'http://devopsguru.ca/workshop',
1394+
blurb: 'DevOpsGuru work with small business to transform from physical to virtual to containerization.'
1395+
},
1396+
{
1397+
type: 1,
1398+
name: 'EIN Intelligence Co., Ltd',
1399+
logo: 'ein',
1400+
link: 'https://ein.io',
1401+
blurb: 'Startups and agile enterprises in South Korea.'
1402+
},
1403+
{
1404+
type: 0,
1405+
name: 'GuardiCore',
1406+
logo: 'guardicore',
1407+
link: 'https://www.guardicore.com/',
1408+
blurb: 'GuardiCore provided process level visibility and network policy enforcement on containerized assets on the Kubernetes platform.'
1409+
},
1410+
{
1411+
type: 0,
1412+
name: 'Hedvig',
1413+
logo: 'hevig',
1414+
link: 'https://www.hedviginc.com/blog/provisioning-hedvig-storage-with-kubernetes',
1415+
blurb: 'Hedvig is software-defined storage that uses NFS or iSCSI for persistent volumes for provisioning shared storage for pods and containers.'
1416+
},
1417+
{
1418+
type: 0,
1419+
name: 'Hewlett Packard Enterprise',
1420+
logo: 'hpe',
1421+
link: ' https://www.hpe.com/us/en/storage/containers.html',
1422+
blurb: 'Persistent Storage that makes data as easy to manage as containers: dynamic provisioning, policy-based performance & protection, QoS, & more.'
1423+
},
1424+
{
1425+
type: 0,
1426+
name: 'JetBrains',
1427+
logo: 'jetbrains',
1428+
link: 'https://blog.jetbrains.com/teamcity/2017/10/teamcity-kubernetes-support-plugin/',
1429+
blurb: 'Run TeamCity cloud build agents in a Kubernetes cluster. Provides Helm support as a build step.'
1430+
},
1431+
{
1432+
type: 2,
1433+
name: 'Opensense',
1434+
logo: 'opensense',
1435+
link: 'http://www.opensense.fr/en/kubernetes-en/',
1436+
blurb: 'We provide Kubernetes services (integration, operation, training) as well as development of banking microservices based on our extended experience with cloud of containers, microservices, data management and financial sector.'
1437+
},
1438+
{
1439+
type: 2,
1440+
name: 'SAP SE',
1441+
logo: 'sap',
1442+
link: 'https://cloudplatform.sap.com',
1443+
blurb: 'The SAP Cloud Platform provides in-memory capabilities and unique business services for building and extending applications. With open sourced Project Gardener, SAP utilizes the power of Kubernetes to enable an open, robust, multi-cloud experience for our customers. You can use simple, modern cloud native design principles and leverage skills your organization already has to deliver agile and transformative applications, while integrating with the latest SAP Leonardo business features.'
1444+
},
1445+
{
1446+
type: 1,
1447+
name: 'Mobilise Cloud Services Limited',
1448+
logo: 'mobilise',
1449+
link: 'http://www.mobilise.cloud/services/serverless-application-delivery',
1450+
blurb: 'Mobilise helps organisations adopt Kubernetes and integrate with their CI/CD tooling.'
1451+
},
13541452
{
13551453
type: 0,
13561454
name: 'Logdna',

_redirects

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
/docs/admin/resourcequota/limitstorageconsumption/ /docs/tasks/administer-cluster/limit-storage-consumption/ 301
5151
/docs/admin/resourcequota/walkthrough/ /docs/tasks/administer-cluster/quota-api-object/ 301
5252
/docs/admin/static-pods/ /docs/tasks/administer-cluster/static-pod/ 301
53-
/docs/admin/sysctls/ /docs/concepts/cluster-administration/sysctl-cluster/ 301
53+
/docs/admin/sysctls/ /docs/tasks/administer-cluster/sysctl-cluster/ 301
5454
/docs/admin/upgrade-1-6/ /docs/tasks/administer-cluster/upgrade-1-6/ 301
5555
/docs/admin/resource-quota/ /docs/concepts/policy/resource-quotas/ 301
5656

@@ -97,6 +97,7 @@
9797
/docs/concepts/cluster-administration/multiple-clusters/ /docs/concepts/cluster-administration/federation/ 301
9898
/docs/concepts/cluster-administration/out-of-resource/ /docs/tasks/administer-cluster/out-of-resource/ 301
9999
/docs/concepts/cluster-administration/resource-usage-monitoring /docs/tasks/debug-application-cluster/resource-usage-monitoring/ 301
100+
/docs/concepts/cluster-administration/sysctl-cluster/ /docs/tasks/administer-cluster/sysctl-cluster/ 301
100101
/docs/concepts/cluster-administration/static-pod/ /docs/tasks/administer-cluster/static-pod/ 301
101102
/docs/concepts/clusters/logging/ /docs/concepts/cluster-administration/logging/ 301
102103
/docs/concepts/configuration/container-command-arg/ /docs/tasks/inject-data-application/define-command-argument-container/ 301

docs/concepts/overview/working-with-objects/labels.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ An empty label selector (that is, one with zero requirements) selects every obje
5858
A null label selector (which is only possible for optional selector fields) selects no objects.
5959

6060
**Note**: the label selectors of two controllers must not overlap within a namespace, otherwise they will fight with each other.
61+
{: .note}
6162

6263
### _Equality-based_ requirement
6364

0 commit comments

Comments
 (0)