whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into chenopis-patch-3

Browse Source
This commit is contained in:
Andrew Chen
2017-01-11 17:09:10 -08:00
committed by GitHub
parent a96ae0e985 5ab052ad89
commit 66f1544194
15 changed files with 154 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CNAME
+1
View File
@@ -0,0 +1 @@
kubernetes.io
docs/admin/cluster-large.md
+2
View File
@@ -14,6 +14,8 @@ At {{page.version}}, Kubernetes supports clusters with up to 1000 nodes. More sp
* No more than 120000 total containers
* No more than 100 pods per node
<br>
* TOC
{:toc}
docs/contribute/write-new-topic.md
+15
View File
@@ -54,6 +54,17 @@ URL for the topic, for example:
http://kubernetes.io/docs/tasks/access-kubernetes-api/http-proxy-access-api/
### Adding the topic title to the front matter
In your topic, put a `title` field in the
[front matter](https://jekyllrb.com/docs/frontmatter/).
The front matter is the YAML block that is between the
triple-dashed lines at the top of the page. Here's an example:
---
title: Using an HTTP Proxy to Access the Kubernetes API
---
### Choosing a directory
Depending on your page type, put your new file in a subdirectory of one of these:
@@ -73,6 +84,10 @@ Depending page type, create an entry in one of these files:
* /_data/tutorials.yaml
* /_data/concepts.yaml
Here's an example of an entry in /_data/tasks.yaml:
- docs/tasks/configure-pod-container/configure-volume-storage.md
### Including code from another file
To include a code file in your topic, place the code file in the Kubernetes
docs/getting-started-guides/ubuntu/decommissioning.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Decommissioning
title: Decommissioning
---
{% capture overview %}
docs/getting-started-guides/ubuntu/glossary.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Glossary and Terminology
title: Glossary and Terminology
---
{% capture overview %}
docs/getting-started-guides/ubuntu/index.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Kubernetes on Ubuntu
title: Kubernetes on Ubuntu
---
{% capture overview %}
docs/getting-started-guides/ubuntu/installation.md
+7 -14
View File
@@ -249,20 +249,13 @@ Feature requests, bug reports, pull requests or any feedback would be much appre
IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level
-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ----------------------------
Amazon Web Services (AWS) | Juju | Ubuntu | flannel, calico* | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
OpenStack | Juju | Ubuntu | flannel, calico | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](http
s://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Microsoft Azure | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](http
s://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Google Compute Engine (GCE) | Juju | Ubuntu | flannel, calico | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](http
s://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Joyent | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](http
s://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Rackspace | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](http
s://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
VMWare vSphere | Juju | Ubuntu | flannel, calico | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](http
s://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Bare Metal (MAAS) | Juju | Ubuntu | flannel, calico | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](http
s://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
OpenStack | Juju | Ubuntu | flannel, calico | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Microsoft Azure | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Google Compute Engine (GCE) | Juju | Ubuntu | flannel, calico | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Joyent | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Rackspace | Juju | Ubuntu | flannel | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
VMWare vSphere | Juju | Ubuntu | flannel, calico | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
Bare Metal (MAAS) | Juju | Ubuntu | flannel, calico | [docs](/docs/getting-started-guides/ubuntu) | | [Commercial](https://ubuntu.com/cloud/kubernetes), [Community](https://github.com/juju-solutions/bundle-kubernetes-core) ( [@mbruzek](https://github.com/mbruzek), [@chuckbutler](https://github.com/chuckbutler) )
For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
docs/getting-started-guides/ubuntu/local.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Local Kubernetes development with LXD
title: Local Kubernetes development with LXD
---
{% capture overview %}
docs/getting-started-guides/ubuntu/logging.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Logging
title: Logging
---
{% capture overview %}
docs/getting-started-guides/ubuntu/monitoring.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Monitoring
title: Monitoring
---
{% capture overview %}
docs/getting-started-guides/ubuntu/networking.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Networking
title: Networking
---
{% capture overview %}
docs/getting-started-guides/ubuntu/scaling.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Scaling
title: Scaling
---
{% capture overview %}
docs/getting-started-guides/ubuntu/security.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Security Considerations
title: Security Considerations
---
{% capture overview %}
docs/getting-started-guides/ubuntu/storage.md
+1 -1
View File
@@ -1,5 +1,5 @@
---
Title: Storage
title: Storage
---
{% capture overview %}
docs/tutorials/stateless-application/hello-minikube.md
+1 -1
View File
@@ -46,7 +46,7 @@ create a local cluster. This tutorial also assumes you are using
on OS X. If you are on a different platform like Linux, or using VirtualBox
instead of Docker for Mac, the instructions to install Minikube may be
slightly different. For general Minikube installation instructions, see
the [Minikube installation guide](docs/getting-started-guides/minikube/).
the [Minikube installation guide](/docs/getting-started-guides/minikube/).
Use `curl` to download and install the latest Minikube release: