Fix use of on-premises terminology (#4413)
* Fix use of on-premises terminology * Update ingress doc with on-premises term
This commit is contained in:
committed by
Andrew Chen
parent
bd2c8cdd61
commit
abd60bc4be
@@ -14,7 +14,7 @@ This is a lightweight version of a broader Cluster Federation feature (previousl
|
|||||||
nickname ["Ubernetes"](https://git.k8s.io/community/contributors/design-proposals/federation.md)).
|
nickname ["Ubernetes"](https://git.k8s.io/community/contributors/design-proposals/federation.md)).
|
||||||
Full Cluster Federation allows combining separate
|
Full Cluster Federation allows combining separate
|
||||||
Kubernetes clusters running in different regions or cloud providers
|
Kubernetes clusters running in different regions or cloud providers
|
||||||
(or on-premise data centers). However, many
|
(or on-premises data centers). However, many
|
||||||
users simply want to run a more available Kubernetes cluster in multiple zones
|
users simply want to run a more available Kubernetes cluster in multiple zones
|
||||||
of their single cloud provider, and this is what the multizone support in 1.2 allows
|
of their single cloud provider, and this is what the multizone support in 1.2 allows
|
||||||
(this previously went by the nickname "Ubernetes Lite").
|
(this previously went by the nickname "Ubernetes Lite").
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
title: Installing Kubernetes On-premise/Cloud Providers with Kubespray
|
title: Installing Kubernetes On-premises/Cloud Providers with Kubespray
|
||||||
---
|
---
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|||||||
+2
-2
@@ -20,8 +20,8 @@ Other/newer ways to set up a Kubernetes cluster include:
|
|||||||
* [Minikube](/docs/getting-started-guides/minikube/): Install a single-node Kubernetes cluster on your local machine for development and testing.
|
* [Minikube](/docs/getting-started-guides/minikube/): Install a single-node Kubernetes cluster on your local machine for development and testing.
|
||||||
* [Installing Kubernetes on AWS with kops](/docs/getting-started-guides/kops/): Bring up a complete Kubernetes cluster on Amazon Web Services, using a tool called `kops`.
|
* [Installing Kubernetes on AWS with kops](/docs/getting-started-guides/kops/): Bring up a complete Kubernetes cluster on Amazon Web Services, using a tool called `kops`.
|
||||||
* [Installing Kubernetes on Linux with kubeadm](/docs/getting-started-guides/kubeadm/) (Beta): Install a secure Kubernetes cluster on any pre-existing machines running Linux, using the built-in `kubeadm` tool.
|
* [Installing Kubernetes on Linux with kubeadm](/docs/getting-started-guides/kubeadm/) (Beta): Install a secure Kubernetes cluster on any pre-existing machines running Linux, using the built-in `kubeadm` tool.
|
||||||
* [Installing Kubernetes On-premise/Cloud Providers with Kubespray](/docs/getting-started-guides/kubespray/): Deploy a Kubernetes cluster on-premises baremetal or hosted on cloud providers, with Ansible and `kubespray` tools.
|
* [Installing Kubernetes On-premises/Cloud Providers with Kubespray](/docs/getting-started-guides/kubespray/): Deploy a Kubernetes cluster on-premises baremetal or hosted on cloud providers, with Ansible and `kubespray` tools.
|
||||||
* [Installing Kubernetes on Ubuntu](/docs/getting-started-guides/ubuntu/): Deploy a Kubernetes cluster on-premise, baremetal, cloud providers, or localhost with Charms and `conjure-up`.
|
* [Installing Kubernetes on Ubuntu](/docs/getting-started-guides/ubuntu/): Deploy a Kubernetes cluster on-premises, baremetal, cloud providers, or localhost with Charms and `conjure-up`.
|
||||||
|
|
||||||
## Concepts, Tasks, and Tutorials
|
## Concepts, Tasks, and Tutorials
|
||||||
|
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ These solutions provide integration with third-party schedulers, resource manage
|
|||||||
* Instructions specify GCE, but are generic enough to be adapted to most existing Mesos clusters
|
* Instructions specify GCE, but are generic enough to be adapted to most existing Mesos clusters
|
||||||
* [DCOS](/docs/getting-started-guides/dcos)
|
* [DCOS](/docs/getting-started-guides/dcos)
|
||||||
* Community Edition DCOS uses AWS
|
* Community Edition DCOS uses AWS
|
||||||
* Enterprise Edition DCOS supports cloud hosting, on-premise VMs, and bare metal
|
* Enterprise Edition DCOS supports cloud hosting, on-premises VMs, and bare metal
|
||||||
|
|
||||||
# Table of Solutions
|
# Table of Solutions
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ unresponsive clusters).
|
|||||||
Federated Ingress is released as an alpha feature, and supports Google Cloud Platform (GKE,
|
Federated Ingress is released as an alpha feature, and supports Google Cloud Platform (GKE,
|
||||||
GCE and hybrid scenarios involving both) in Kubernetes v1.4. Work is under way to support other cloud
|
GCE and hybrid scenarios involving both) in Kubernetes v1.4. Work is under way to support other cloud
|
||||||
providers such as AWS, and other hybrid cloud scenarios (e.g. services
|
providers such as AWS, and other hybrid cloud scenarios (e.g. services
|
||||||
spanning private on-premise as well as public cloud Kubernetes
|
spanning private on-premises as well as public cloud Kubernetes
|
||||||
clusters).
|
clusters).
|
||||||
|
|
||||||
You create Federated Ingresses in much that same way as traditional
|
You create Federated Ingresses in much that same way as traditional
|
||||||
@@ -303,7 +303,3 @@ Check that:
|
|||||||
[Federation proposal](https://git.k8s.io/community/contributors/design-proposals/federation.md).
|
[Federation proposal](https://git.k8s.io/community/contributors/design-proposals/federation.md).
|
||||||
{% endcapture %}
|
{% endcapture %}
|
||||||
{% include templates/task.md %}
|
{% include templates/task.md %}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,13 +35,13 @@ annotations["federation.kubernetes.io/replica-set-preferences"] = preferences {
|
|||||||
#
|
#
|
||||||
# In English, the policy asserts that resources in the "production" namespace
|
# In English, the policy asserts that resources in the "production" namespace
|
||||||
# that are not annotated with "criticality=low" MUST be placed on clusters
|
# that are not annotated with "criticality=low" MUST be placed on clusters
|
||||||
# labelled with "on-premise=true".
|
# labelled with "on-premises=true".
|
||||||
annotations["federation.alpha.kubernetes.io/cluster-selector"] = selector {
|
annotations["federation.alpha.kubernetes.io/cluster-selector"] = selector {
|
||||||
input.metadata.namespace = "production"
|
input.metadata.namespace = "production"
|
||||||
not input.metadata.annotations.criticality = "low"
|
not input.metadata.annotations.criticality = "low"
|
||||||
json.marshal([{
|
json.marshal([{
|
||||||
"operator": "=",
|
"operator": "=",
|
||||||
"key": "on-premise",
|
"key": "on-premises",
|
||||||
"values": "[true]",
|
"values": "[true]",
|
||||||
}], selector)
|
}], selector)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -50,7 +50,7 @@ cid: home
|
|||||||
<div class="image-wrapper"><img src="images/suitcase.png"></div>
|
<div class="image-wrapper"><img src="images/suitcase.png"></div>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<h4>Run Anywhere</h4>
|
<h4>Run Anywhere</h4>
|
||||||
<p>Kubernetes is open source giving you the freedom to take advantage of on-premise, hybrid, or public cloud infrastructure, letting you effortlessly move workloads to where it matters to you.</p>
|
<p>Kubernetes is open source giving you the freedom to take advantage of on-premises, hybrid, or public cloud infrastructure, letting you effortlessly move workloads to where it matters to you.</p>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
Reference in New Issue
Block a user