Skip to content

Commit

Permalink
Merge branch 'master' into release-1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@zparnold
zparnold committed Sep 27, 2018
2 parents 140dec0 + 593b631 commit 36fbc62
Show file tree
Hide file tree
Showing 9 changed files with 131 additions and 274 deletions.
1 change: 0 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ install:

script:
- go test -v k8s.io/website/content/en/examples
#- ./verify-docs-format.sh
2 changes: 1 addition & 1 deletion config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ githubbranch = "master"
docsbranch = "master"
deprecated = false
currentUrl = "https://kubernetes.io/docs/home/"
nextUrl = "http://kubernetes-io-vnext-staging.netlify.com/"
nextUrl = "https://kubernetes-io-vnext-staging.netlify.com/"
githubWebsiteRepo = "github.com/kubernetes/website"
githubWebsiteRaw = "raw.githubusercontent.com/kubernetes/website"

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/configuration/assign-pod-node.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ in the section [Interlude: built-in node labels](#interlude-built-in-node-labels
processing which can slow down scheduling in large clusters significantly. We do
not recommend using them in clusters larger than several hundred nodes.

**Note:** Pod anti-affinity requires nodes to be consistently labelled, i.e. every node in the cluster must have an appropriate label matching `topologyKey`. If some or all nodes are missing the speficied `topologyKey` label, it can lead to unintended behavior.
**Note:** Pod anti-affinity requires nodes to be consistently labelled, i.e. every node in the cluster must have an appropriate label matching `topologyKey`. If some or all nodes are missing the specified `topologyKey` label, it can lead to unintended behavior.

As with node affinity, there are currently two types of pod affinity and anti-affinity, called `requiredDuringSchedulingIgnoredDuringExecution` and
`preferredDuringSchedulingIgnoredDuringExecution` which denote "hard" vs. "soft" requirements.
Expand Down
11 changes: 0 additions & 11 deletions content/en/docs/contribute/style/page-templates.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ To write a new concept page, create a Markdown file in a subdirectory of the
need):

```
{% raw %}
{{%/* capture overview */%}}
{{%/* /capture */%}}
Expand All @@ -66,8 +64,6 @@ To write a new concept page, create a Markdown file in a subdirectory of the
{{%/* capture whatsnext */%}}
{{%/* /capture */%}}
{% endraw %}
```

- Within each section, write your content. Use the following guidelines:
Expand Down Expand Up @@ -107,8 +103,6 @@ To write a new task page, create a Markdown file in a subdirectory of the
need):

```
{% raw %}
{{%/* capture overview */%}}
{{%/* /capture */%}}
Expand All @@ -130,8 +124,6 @@ To write a new task page, create a Markdown file in a subdirectory of the
{{%/* capture whatsnext */%}}
{{%/* /capture */%}}
{% endraw %}
```

- Within each section, write your content. Use the following guidelines:
Expand Down Expand Up @@ -177,8 +169,6 @@ To write a new tutorial page, create a Markdown file in a subdirectory of the
need):

```
{% raw %}
{{%/* capture overview */%}}
{{%/* /capture */%}}
Expand All @@ -204,7 +194,6 @@ To write a new tutorial page, create a Markdown file in a subdirectory of the
{{%/* capture whatsnext */%}}
{{%/* /capture */%}}
{% endraw %}
```

- Within each section, write your content. Use the following guidelines:
Expand Down
89 changes: 85 additions & 4 deletions content/en/docs/setup/_index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,92 @@ reviewers:
- erictune
- mikedanese
no_issue: true
weight: 30
title: Setup
main_menu: true
weight: 30
content_template: templates/concept
---

This section provides instructions for installing Kubernetes and setting
up a Kubernetes cluster. For an overview of the different options, see
[Picking the Right Solution](/docs/setup/pick-right-solution/).
{{% capture overview %}}

Use this page to find the type of solution that best fits your needs.

Deciding where to run Kubernetes depends on what resources you have available
and how much flexibility you need. You can run Kubernetes almost anywhere,
from your laptop to VMs on a cloud provider to a rack of bare metal servers.
You can also set up a fully-managed cluster by running a single command or craft
your own customized cluster on your bare metal servers.

{{% /capture %}}

{{% capture body %}}

## Local-machine Solutions

A local-machine solution is an easy way to get started with Kubernetes. You
can create and test Kubernetes clusters without worrying about consuming cloud
resources and quotas.

You should pick a local solution if you want to:

* Try or start learning about Kubernetes
* Develop and test clusters locally

Pick a [local-machine solution](/docs/setup/pick-right-solution/#local-machine-solutions).

## Hosted Solutions

Hosted solutions are a convenient way to create and maintain Kubernetes clusters. They
manage and operate your clusters so you don’t have to.

You should pick a hosted solution if you:

* Want a fully-managed solution
* Want to focus on developing your apps or services
* Don’t have dedicated site reliability engineering (SRE) team but want high availability
* Don't have resources to host and monitor your clusters

Pick a [hosted solution](/docs/setup/pick-right-solution/#hosted-solutions).

## Turnkey – Cloud Solutions


These solutions allow you to create Kubernetes clusters with only a few commands and
are actively developed and have active community support. They can also be hosted on
a range of Cloud IaaS providers, but they offer more freedom and flexibility in
exchange for effort.

You should pick a turnkey cloud solution if you:

* Want more control over your clusters than the hosted solutions allow
* Want to take on more operations ownership

Pick a [turnkey cloud solution](/docs/setup/pick-right-solution/#turnkey-cloud-solutions)

## Turnkey – On-Premises Solutions

These solutions allow you to create Kubernetes clusters on your internal, secure,
cloud network with only a few commands.

You should pick a on-prem turnkey cloud solution if you:

* Want to deploy clusters on your private cloud network
* Have a dedicated SRE team
* Have the the resources to host and monitor your clusters

Pick an [on-prem turnkey cloud solution](/docs/setup/pick-right-solution/#on-premises-turnkey-cloud-solutions).

## Custom Solutions

Custom solutions give you the most freedom over your clusters but require the
most expertise. These solutions range from bare-metal to cloud providers on
different operating systems.

Pick a [custom solution](/docs/setup/pick-right-solution/#custom-solutions).

{{% /capture %}}

{{% capture whatsnext %}}
Go to [Picking the Right Solution](/docs/setup/pick-right-solution/) for a complete
list of solutions.
{{% /capture %}}
89 changes: 44 additions & 45 deletions content/en/docs/setup/pick-right-solution.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,86 +34,85 @@ a Kubernetes cluster from scratch.

* [Minikube](/docs/setup/minikube/) is the recommended method for creating a local, single-node Kubernetes cluster for development and testing. Setup is completely automated and doesn't require a cloud provider account.

* [Kubeadm-dind](https://github.com/kubernetes-sigs/kubeadm-dind-cluster) is a multi-node (while minikube is single-node) Kubernetes cluster which only requires a docker daemon. It uses docker-in-docker technique to spawn the Kubernetes cluster.

* [Ubuntu on LXD](/docs/getting-started-guides/ubuntu/local/) supports a nine-instance deployment on localhost.

* [IBM Cloud Private-CE (Community Edition)](https://github.com/IBM/deploy-ibm-cloud-private) can use VirtualBox on your machine to deploy Kubernetes to one or more VMs for development and test scenarios. Scales to full multi-node cluster.

* [IBM Cloud Private-CE (Community Edition) on Linux Containers](https://github.com/HSBawa/icp-ce-on-linux-containers) is a Terraform/Packer/BASH based Infrastructure as Code (IaC) scripts to create a seven node (1 Boot, 1 Master, 1 Management, 1 Proxy and 3 Workers) LXD cluster on Linux Host.

* [Kubeadm-dind](https://github.com/kubernetes-sigs/kubeadm-dind-cluster) is a multi-node (while minikube is single-node) Kubernetes cluster which only requires a docker daemon. It uses docker-in-docker technique to spawn the Kubernetes cluster.

* [Ubuntu on LXD](/docs/getting-started-guides/ubuntu/local/) supports a nine-instance deployment on localhost.

## Hosted Solutions

* [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/) offers managed Kubernetes clusters.
* [AppsCode.com](https://appscode.com/products/cloud-deployment/) provides managed Kubernetes clusters for various public clouds, including AWS and Google Cloud Platform.

* [APPUiO](https://appuio.ch) runs an OpenShift public cloud platform, supporting any Kubernetes workload. Additionally APPUiO offers Private Managed OpenShift Clusters, running on any public or private cloud.

* [Amazon Elastic Container Service for Kubernetes](https://aws.amazon.com/eks/) offers managed Kubernetes service.

* [Azure Kubernetes Service](https://azure.microsoft.com/services/container-service/) offers managed Kubernetes clusters.

* [Stackpoint.io](https://stackpoint.io) provides Kubernetes infrastructure automation and management for multiple public clouds.

* [AppsCode.com](https://appscode.com/products/cloud-deployment/) provides managed Kubernetes clusters for various public clouds, including AWS and Google Cloud Platform.
* [Giant Swarm](https://giantswarm.io/product/) offers managed Kubernetes clusters in their own datacenter, on-premises, or on public clouds.

* [Madcore.Ai](https://madcore.ai) is devops-focused CLI tool for deploying Kubernetes infrastructure in AWS. Master, auto-scaling group nodes with spot-instances, ingress-ssl-lego, Heapster, and Grafana.
* [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/) offers managed Kubernetes clusters.

* [Platform9](https://platform9.com/products/kubernetes/) offers managed Kubernetes on-premises or on any public cloud, and provides 24/7 health monitoring and alerting. (Kube2go, a web-UI driven Kubernetes cluster deployment service Platform9 released, has been integrated to Platform9 Sandbox.)
* [IBM Cloud Kubernetes Service](https://console.bluemix.net/docs/containers/container_index.html) offers managed Kubernetes clusters with isolation choice, operational tools, integrated security insight into images and containers, and integration with Watson, IoT, and data.

* [OpenShift Dedicated](https://www.openshift.com/dedicated/) offers managed Kubernetes clusters powered by OpenShift.
* [Kubermatic](https://www.loodse.com) provides managed Kubernetes clusters for various public clouds, including AWS and Digital Ocean, as well as on-premises with OpenStack integration.

* [OpenShift Online](https://www.openshift.com/features/) provides free hosted access for Kubernetes applications.
* [Kublr](https://kublr.com) offers enterprise-grade secure, scalable, highly reliable Kubernetes clusters on AWS, Azure, GCP, and on-premise. It includes out-of-the-box backup and disaster recovery, multi-cluster centralized logging and monitoring, and built-in alerting.

* [IBM Cloud Kubernetes Service](https://console.bluemix.net/docs/containers/container_index.html) offers managed Kubernetes clusters with isolation choice, operational tools, integrated security insight into images and containers, and integration with Watson, IoT, and data.
* [Madcore.Ai](https://madcore.ai) is devops-focused CLI tool for deploying Kubernetes infrastructure in AWS. Master, auto-scaling group nodes with spot-instances, ingress-ssl-lego, Heapster, and Grafana.

* [Giant Swarm](https://giantswarm.io/product/) offers managed Kubernetes clusters in their own datacenter, on-premises, or on public clouds.
* [OpenShift Dedicated](https://www.openshift.com/dedicated/) offers managed Kubernetes clusters powered by OpenShift.

* [Kubermatic](https://www.loodse.com) provides managed Kubernetes clusters for various public clouds, including AWS and Digital Ocean, as well as on-premises with OpenStack integration.
* [OpenShift Online](https://www.openshift.com/features/) provides free hosted access for Kubernetes applications.

* [Oracle Container Engine for Kubernetes](https://docs.us-phoenix-1.oraclecloud.com/Content/ContEng/Concepts/contengoverview.htm) is a fully-managed, scalable, and highly available service that you can use to deploy your containerized applications to the cloud.

* [Kublr](https://kublr.com) offers enterprise-grade secure, scalable, highly reliable Kubernetes clusters on AWS, Azure, GCP, and on-premise. It includes out-of-the-box backup and disaster recovery, multi-cluster centralized logging and monitoring, and built-in alerting.
* [Platform9](https://platform9.com/products/kubernetes/) offers managed Kubernetes on-premises or on any public cloud, and provides 24/7 health monitoring and alerting. (Kube2go, a web-UI driven Kubernetes cluster deployment service Platform9 released, has been integrated to Platform9 Sandbox.)

* [APPUiO](https://appuio.ch) runs an OpenShift public cloud platform, supporting any Kubernetes workload. Additionally APPUiO offers Private Managed OpenShift Clusters, running on any public or private cloud.
* [Stackpoint.io](https://stackpoint.io) provides Kubernetes infrastructure automation and management for multiple public clouds.

# Turnkey Cloud Solutions
## Turnkey Cloud Solutions

These solutions allow you to create Kubernetes clusters on a range of Cloud IaaS providers with only a
few commands. These solutions are actively developed and have active community support.

* [Conjure-up Kubernetes with Ubuntu on AWS, Azure, Google Cloud, Oracle Cloud](/docs/getting-started-guides/ubuntu/)
* [Google Compute Engine (GCE)](/docs/setup/turnkey/gce/)
* [Agile Stacks](https://www.agilestacks.com/products/kubernetes)
* [Alibaba Cloud](/docs/setup/turnkey/alibaba-cloud/)
* [APPUiO](https://appuio.ch)
* [AWS](/docs/setup/turnkey/aws/)
* [Azure](/docs/setup/turnkey/azure/)
* [Tectonic by CoreOS](https://coreos.com/tectonic)
* [CenturyLink Cloud](/docs/setup/turnkey/clc/)
* [IBM Cloud](https://github.com/patrocinio/kubernetes-softlayer)
* [IBM Cloud Private Running on Multiple Clouds](https://www.ibm.com/developerworks/community/wikis/home?lang=en-us#!/wiki/W1559b1be149d_43b0_881e_9783f38faaff/page/IBM%20Cloud%20Private%20running%20on%20multiple%20clouds)
* [Stackpoint.io](/docs/setup/turnkey/stackpoint/)
* [Madcore.Ai](https://madcore.ai/)
* [Kubermatic](https://cloud.kubermatic.io)
* [Rancher 2.0](https://rancher.com/docs/rancher/v2.x/en/)
* [Oracle Container Engine for K8s](https://docs.us-phoenix-1.oraclecloud.com/Content/ContEng/Concepts/contengprerequisites.htm)
* [Conjure-up Kubernetes with Ubuntu on AWS, Azure, Google Cloud, Oracle Cloud](/docs/getting-started-guides/ubuntu/)
* [Gardener](https://gardener.cloud/)
* [Google Compute Engine (GCE)](/docs/setup/turnkey/gce/)
* [IBM Cloud](https://github.com/patrocinio/kubernetes-softlayer)
* [Kontena Pharos](https://kontena.io/pharos/)
* [Kubermatic](https://cloud.kubermatic.io)
* [Kublr](https://kublr.com/)
* [Agile Stacks](https://www.agilestacks.com/products/kubernetes)
* [Alibaba Cloud](/docs/setup/turnkey/alibaba-cloud/)
* [APPUiO](https://appuio.ch)
* [Madcore.Ai](https://madcore.ai/)
* [Oracle Container Engine for K8s](https://docs.us-phoenix-1.oraclecloud.com/Content/ContEng/Concepts/contengprerequisites.htm)
* [Pivotal Container Service](https://pivotal.io/platform/pivotal-container-service)
* [Rancher 2.0](https://rancher.com/docs/rancher/v2.x/en/)
* [Stackpoint.io](/docs/setup/turnkey/stackpoint/)
* [Tectonic by CoreOS](https://coreos.com/tectonic)

## On-Premises turnkey cloud solutions
These solutions allow you to create Kubernetes clusters on your internal, secure, cloud network with only a
few commands.

* [Agile Stacks](https://www.agilestacks.com/products/kubernetes)
* [APPUiO](https://appuio.ch)
* [IBM Cloud Private](https://www.ibm.com/cloud-computing/products/ibm-cloud-private/)
* [Kubermatic](https://www.loodse.com)
* [SUSE CaaS Platform](https://www.suse.com/products/caas-platform)
* [SUSE Cloud Application Platform](https://www.suse.com/products/cloud-application-platform/)
* [Rancher 2.0](https://rancher.com/docs/rancher/v2.x/en/)
* [Kontena Pharos](https://kontena.io/pharos/)
* [Kubermatic](https://www.loodse.com)
* [Kublr](https://kublr.com/)
* [Agile Stacks](https://www.agilestacks.com/products/kubernetes)
* [APPUiO](https://appuio.ch)
* [Pivotal Container Service](https://pivotal.io/platform/pivotal-container-service)
* [Rancher 2.0](https://rancher.com/docs/rancher/v2.x/en/)
* [SUSE CaaS Platform](https://www.suse.com/products/caas-platform)
* [SUSE Cloud Application Platform](https://www.suse.com/products/cloud-application-platform/)

## Custom Solutions

Expand All @@ -139,28 +138,28 @@ with a single command per machine.
These solutions are combinations of cloud providers and operating systems not covered by the above solutions.

* [CoreOS on AWS or GCE](/docs/setup/custom-cloud/coreos/)
* [Gardener](https://gardener.cloud/)
* [Kublr](https://kublr.com/)
* [Kubernetes on Ubuntu](/docs/getting-started-guides/ubuntu/)
* [Kubespray](/docs/setup/custom-cloud/kubespray/)
* [Rancher Kubernetes Engine (RKE)](https://github.com/rancher/rke)
* [Gardener](https://gardener.cloud/)
* [Kublr](https://kublr.com/)

### On-Premises VMs

* [Vagrant](/docs/setup/custom-cloud/coreos/) (uses CoreOS and flannel)
* [CloudStack](/docs/setup/on-premises-vm/cloudstack/) (uses Ansible, CoreOS and flannel)
* [Fedora (Multi Node)](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/) (uses Fedora and flannel)
* [oVirt](/docs/setup/on-premises-vm/ovirt/)
* [Vagrant](/docs/setup/custom-cloud/coreos/) (uses CoreOS and flannel)
* [VMware](/docs/setup/custom-cloud/coreos/) (uses CoreOS and flannel)
* [VMware vSphere](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/)
* [VMware vSphere, OpenStack, or Bare Metal](/docs/getting-started-guides/ubuntu/) (uses Juju, Ubuntu and flannel)
* [VMware](/docs/setup/custom-cloud/coreos/) (uses CoreOS and flannel)
* [oVirt](/docs/setup/on-premises-vm/ovirt/)
* [Fedora (Multi Node)](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/) (uses Fedora and flannel)

### Bare Metal

* [CoreOS](/docs/setup/custom-cloud/coreos/)
* [Fedora (Single Node)](/docs/getting-started-guides/fedora/fedora_manual_config/)
* [Fedora (Multi Node)](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/)
* [Kubernetes on Ubuntu](/docs/getting-started-guides/ubuntu/)
* [CoreOS](/docs/setup/custom-cloud/coreos/)

### Integrations

Expand Down Expand Up @@ -218,7 +217,7 @@ any | RKE | multi-support | flannel or canal
any | [Gardener Cluster-Operator](https://kubernetes.io/blog/2018/05/17/gardener/) | multi-support | multi-support | [docs](https://gardener.cloud) | [Project/Community](https://github.com/gardener) and [Commercial]( https://cloudplatform.sap.com/)
Alibaba Cloud Container Service For Kubernetes | ROS | CentOS | flannel/Terway | [docs](https://www.aliyun.com/product/containerservice) | Commercial
Agile Stacks | Terraform | CoreOS | multi-support | [docs](https://www.agilestacks.com/products/kubernetes) | Commercial
IBM Cloud Kubernetes Service | | Ubuntu | calico | [docs](https://console.bluemix.net/docs/containers/container_index.html) | Commercial
IBM Cloud Kubernetes Service | | Ubuntu | calico | [docs](https://console.bluemix.net/docs/containers/container_index.html) | Commercial


{{< note >}}
Expand Down
Loading

0 comments on commit 36fbc62

Please sign in to comment.