From abd60bc4bed598e21fd2830d903f1e3de02e6c9e Mon Sep 17 00:00:00 2001 From: Luke Heidecke Date: Tue, 1 Aug 2017 18:10:37 -0400 Subject: [PATCH] Fix use of on-premises terminology (#4413) * Fix use of on-premises terminology * Update ingress doc with on-premises term --- docs/admin/multiple-zones.md | 2 +- docs/getting-started-guides/kubespray.md | 2 +- docs/home/index.md | 4 ++-- docs/setup/pick-right-solution.md | 2 +- docs/tasks/administer-federation/ingress.md | 6 +----- docs/tasks/federation/policy.rego | 4 ++-- index.html | 2 +- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/docs/admin/multiple-zones.md b/docs/admin/multiple-zones.md index 7c2f522789..e8308a1a3a 100644 --- a/docs/admin/multiple-zones.md +++ b/docs/admin/multiple-zones.md @@ -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)). Full Cluster Federation allows combining separate 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 of their single cloud provider, and this is what the multizone support in 1.2 allows (this previously went by the nickname "Ubernetes Lite"). diff --git a/docs/getting-started-guides/kubespray.md b/docs/getting-started-guides/kubespray.md index 17c1e446bc..6bf2fd66e9 100644 --- a/docs/getting-started-guides/kubespray.md +++ b/docs/getting-started-guides/kubespray.md @@ -1,5 +1,5 @@ --- -title: Installing Kubernetes On-premise/Cloud Providers with Kubespray +title: Installing Kubernetes On-premises/Cloud Providers with Kubespray --- ## Overview diff --git a/docs/home/index.md b/docs/home/index.md index 89266aaa91..d6d052b6be 100644 --- a/docs/home/index.md +++ b/docs/home/index.md @@ -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. * [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-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 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-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-premises, baremetal, cloud providers, or localhost with Charms and `conjure-up`. ## Concepts, Tasks, and Tutorials diff --git a/docs/setup/pick-right-solution.md b/docs/setup/pick-right-solution.md index 2a25d144c3..a4954209c9 100644 --- a/docs/setup/pick-right-solution.md +++ b/docs/setup/pick-right-solution.md @@ -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 * [DCOS](/docs/getting-started-guides/dcos) * 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 diff --git a/docs/tasks/administer-federation/ingress.md b/docs/tasks/administer-federation/ingress.md index 9149b761b1..693612b59b 100644 --- a/docs/tasks/administer-federation/ingress.md +++ b/docs/tasks/administer-federation/ingress.md @@ -22,7 +22,7 @@ unresponsive clusters). 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 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). 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). {% endcapture %} {% include templates/task.md %} - - - - diff --git a/docs/tasks/federation/policy.rego b/docs/tasks/federation/policy.rego index 09ff0dc5c4..9ec64d37c9 100644 --- a/docs/tasks/federation/policy.rego +++ b/docs/tasks/federation/policy.rego @@ -35,13 +35,13 @@ annotations["federation.kubernetes.io/replica-set-preferences"] = preferences { # # In English, the policy asserts that resources in the "production" namespace # 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 { input.metadata.namespace = "production" not input.metadata.annotations.criticality = "low" json.marshal([{ "operator": "=", - "key": "on-premise", + "key": "on-premises", "values": "[true]", }], selector) } diff --git a/index.html b/index.html index 12f4848394..b8c0289fa8 100644 --- a/index.html +++ b/index.html @@ -50,7 +50,7 @@ cid: home

Run Anywhere

-

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.

+

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.