kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #780 from quinton-hoole/2016-07-06-expunge-ubernetes 

Deprecate the term "Ubernetes" in documentation.
pull/785/head
Quinton Hoole 2016-07-06 17:25:29 -07:00 committed by GitHub
parent 94e7f02e53 24578658a2
commit 8dc87a6aa9
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/admin/dns.md
View File

@ -31,9 +31,13 @@ performance. The healthz container provides a single health check endpoint while
## Kubernetes Federation (Multiple Zone support) ## Kubernetes Federation (Multiple Zone support)
The 1.3 release introduced Federation (Ubernetes) support for multisite Kubernetes installations. There are Release 1.3 introduced Cluster Federation support for multi-site
DNS changes introduced that will allow the lookup of services using a six part DNS name. Kubernetes installations. This required some minor
See [Federation docs](/docs/admin/multiple-zones/) for more details on multiple site support. (backward-compatible) changes to the way
the Kubernetes cluster DNS server processes DNS queries, to facilitate
the lookup of federated services (which span multiple Kubernetes clusters).
See the [Cluster Federation Administrators' Guide](/docs/admin/federation/index.md) for more
details on Cluster Federation and multi-site support.
## References ## References

12
docs/admin/multiple-zones.md
View File

@ -5,14 +5,14 @@
Kubernetes 1.2 adds support for running a single cluster in multiple failure zones Kubernetes 1.2 adds support for running a single cluster in multiple failure zones
(GCE calls them simply "zones", AWS calls them "availability zones", here we'll refer to them as "zones"). (GCE calls them simply "zones", AWS calls them "availability zones", here we'll refer to them as "zones").
This is a lightweight version of a broader effort for federating multiple This is a lightweight version of a broader Cluster Federation feature (previously referred to by the affectionate
Kubernetes clusters together (sometimes referred to by the affectionate
nickname ["Ubernetes"](https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/federation.md). nickname ["Ubernetes"](https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/federation.md).
Full federation will allow combining separate Full Cluster Federation allows combining separate
Kubernetes clusters running in different regions or clouds. However, many Kubernetes clusters running in different regions or cloud providers
(or on-premise 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 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
(we nickname this "Ubernetes Lite"). (this previously went by the nickname "Ubernetes Lite").
Multizone support is deliberately limited: a single Kubernetes cluster can run Multizone support is deliberately limited: a single Kubernetes cluster can run
in multiple zones, but only within the same region (and cloud provider). Only in multiple zones, but only within the same region (and cloud provider). Only