From 0e32ae8c9dd44e776d0459ba57f0ddc567a33ca0 Mon Sep 17 00:00:00 2001 From: "Jason L. van Brackel" Date: Tue, 9 Apr 2019 11:07:32 -0400 Subject: [PATCH 1/5] Adding k3s information --- content/en/docs/setup/pick-right-solution.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/content/en/docs/setup/pick-right-solution.md b/content/en/docs/setup/pick-right-solution.md index 16ad1ae2cc500..9f7716cf251c6 100644 --- a/content/en/docs/setup/pick-right-solution.md +++ b/content/en/docs/setup/pick-right-solution.md @@ -69,6 +69,8 @@ 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. +* [k3s](https://k3s.io) is a lightweight production-grade kubernetes distribution. With a super-simple installation process and a binary foot print around 40MB, it is ideal for local-machine developent. + * [Ubuntu on LXD](/docs/getting-started-guides/ubuntu/local/) supports a nine-instance deployment on localhost. ## Hosted Solutions @@ -161,6 +163,7 @@ few commands. * [Giant Swarm](https://giantswarm.io) * [GKE On-Prem | Google Cloud](https://cloud.google.com/gke-on-prem/) * [IBM Cloud Private](https://www.ibm.com/cloud-computing/products/ibm-cloud-private/) +* [k3s](https://k3s.io) * [Kontena Pharos](https://kontena.io/pharos/) * [Kubermatic](https://www.loodse.com) * [Kublr](www.kublr.com/kubernetes.io/setup-hosted-solution) @@ -219,6 +222,7 @@ These solutions are combinations of cloud providers and operating systems not co * [Docker Enterprise](https://www.docker.com/products/docker-enterprise) * [Fedora (Single Node)](/docs/getting-started-guides/fedora/fedora_manual_config/) * [Fedora (Multi Node)](/docs/getting-started-guides/fedora/flannel_multi_node_cluster/) +* [k3s](https://k3s.io) * [Kubernetes on Ubuntu](/docs/getting-started-guides/ubuntu/) * [OpenShift Container Platform](https://www.openshift.com/products/container-platform/) (OCP) Kubernetes platform by [Red Hat](https://www.redhat.com) * [Platform9 Managed Kubernetes as a Service](https://platform9.com/managed-kubernetes/) works on any infrastructure: on-premises, bare metal, or private/hybrid cloud. @@ -282,6 +286,7 @@ Oracle Cloud Infrastructure Container Engine for Kubernetes (OKE) | oVirt | | | | [docs](/docs/setup/on-premises-vm/ovirt/) | Community ([@simon3z](https://github.com/simon3z)) Platform9 | | multi-support | multi-support | [docs](https://platform9.com/managed-kubernetes/) | Commercial Rackspace | custom | CoreOS | flannel/calico/canal | [docs](https://developer.rackspace.com/docs/rkaas/latest/) | [Commercial](https://www.rackspace.com/managed-kubernetes) +Rancher Red Hat OpenShift | Ansible & CoreOS | RHEL & CoreOS | [multi-support](https://docs.openshift.com/container-platform/3.11/architecture/networking/network_plugins.html) | [docs](https://docs.openshift.com/container-platform/3.11/welcome/index.html) | Commercial Stackpoint.io | | multi-support | multi-support | [docs](https://stackpoint.io/) | Commercial Vagrant | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/coreos/) | Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles)) From 5ca5844081e40f6a9b896c654ac7d5be04effb03 Mon Sep 17 00:00:00 2001 From: "Jason L. van Brackel" Date: Tue, 9 Apr 2019 15:22:51 +0000 Subject: [PATCH 2/5] Adding k3s information --- content/en/docs/setup/pick-right-solution.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/en/docs/setup/pick-right-solution.md b/content/en/docs/setup/pick-right-solution.md index 9f7716cf251c6..fe71cbc24c83e 100644 --- a/content/en/docs/setup/pick-right-solution.md +++ b/content/en/docs/setup/pick-right-solution.md @@ -137,6 +137,7 @@ few commands. These solutions are actively developed and have active community s * [Giant Swarm](https://giantswarm.io) * [Google Compute Engine (GCE)](/docs/setup/turnkey/gce/) * [IBM Cloud](https://github.com/patrocinio/kubernetes-softlayer) +* [k3s](https://k3s.io) * [Kontena Pharos](https://kontena.io/pharos/) * [Kubermatic](https://cloud.kubermatic.io) * [Kublr](https://kublr.com/) From e2717613d24b56878cb24a056beb09b6d568f927 Mon Sep 17 00:00:00 2001 From: "Jason L. van Brackel" Date: Tue, 9 Apr 2019 18:52:19 +0000 Subject: [PATCH 3/5] Add K3s information. --- content/en/docs/setup/pick-right-solution.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/en/docs/setup/pick-right-solution.md b/content/en/docs/setup/pick-right-solution.md index fe71cbc24c83e..606bc2b7e881d 100644 --- a/content/en/docs/setup/pick-right-solution.md +++ b/content/en/docs/setup/pick-right-solution.md @@ -69,7 +69,7 @@ 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. -* [k3s](https://k3s.io) is a lightweight production-grade kubernetes distribution. With a super-simple installation process and a binary foot print around 40MB, it is ideal for local-machine developent. +* [k3s](https://k3s.io) is a lightweight production-grade Kubernetes distribution. With a super-simple installation process and a binary foot print around 40MB, it is ideal for local-machine development. * [Ubuntu on LXD](/docs/getting-started-guides/ubuntu/local/) supports a nine-instance deployment on localhost. @@ -287,7 +287,6 @@ Oracle Cloud Infrastructure Container Engine for Kubernetes (OKE) | oVirt | | | | [docs](/docs/setup/on-premises-vm/ovirt/) | Community ([@simon3z](https://github.com/simon3z)) Platform9 | | multi-support | multi-support | [docs](https://platform9.com/managed-kubernetes/) | Commercial Rackspace | custom | CoreOS | flannel/calico/canal | [docs](https://developer.rackspace.com/docs/rkaas/latest/) | [Commercial](https://www.rackspace.com/managed-kubernetes) -Rancher Red Hat OpenShift | Ansible & CoreOS | RHEL & CoreOS | [multi-support](https://docs.openshift.com/container-platform/3.11/architecture/networking/network_plugins.html) | [docs](https://docs.openshift.com/container-platform/3.11/welcome/index.html) | Commercial Stackpoint.io | | multi-support | multi-support | [docs](https://stackpoint.io/) | Commercial Vagrant | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/coreos/) | Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles)) From 008babbff855e85a6252f3c344e59eb47aa6d8b6 Mon Sep 17 00:00:00 2001 From: "Jason L. van Brackel" Date: Tue, 9 Apr 2019 14:59:57 -0400 Subject: [PATCH 4/5] Change Rancher 2.0 to Rancher --- content/en/docs/setup/pick-right-solution.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/docs/setup/pick-right-solution.md b/content/en/docs/setup/pick-right-solution.md index 606bc2b7e881d..941103c74aef9 100644 --- a/content/en/docs/setup/pick-right-solution.md +++ b/content/en/docs/setup/pick-right-solution.md @@ -147,7 +147,7 @@ few commands. These solutions are actively developed and have active community s * [Oracle Cloud Infrastructure Container Engine for Kubernetes (OKE)](https://docs.us-phoenix-1.oraclecloud.com/Content/ContEng/Concepts/contengprerequisites.htm) * [Pivotal Container Service](https://pivotal.io/platform/pivotal-container-service) * [Platform9 Managed Kubernetes as a Service](https://platform9.com/managed-kubernetes/) -* [Rancher 2.0](https://rancher.com/docs/rancher/v2.x/en/) +* [Rancher](https://rancher.com/docs/rancher/v2.x/en/) * [Stackpoint.io](/docs/setup/turnkey/stackpoint/) * [Supergiant.io](https://supergiant.io/) * [VEXXHOST](https://vexxhost.com/private-cloud/) @@ -173,7 +173,7 @@ few commands. * [OpenShift Container Platform](https://www.openshift.com/products/container-platform/) (OCP) by [Red Hat](https://www.redhat.com) * [Pivotal Container Service](https://pivotal.io/platform/pivotal-container-service) * [Platform9 Managed Kubernetes as a Service](https://platform9.com/managed-kubernetes/) -* [Rancher 2.0](https://rancher.com/docs/rancher/v2.x/en/) +* [Rancher](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/) * [VMware Enterprise PKS](https://cloud.vmware.com/vmware-enterprise-pks) From becf2c2a74fc8241291b0370b582a5dbebc40218 Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Mon, 15 Apr 2019 12:37:43 -0400 Subject: [PATCH 5/5] Update content/en/docs/setup/pick-right-solution.md per suggestion by @sftim Co-Authored-By: JasonvanBrackel --- content/en/docs/setup/pick-right-solution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/setup/pick-right-solution.md b/content/en/docs/setup/pick-right-solution.md index bad853bc57832..9c7a3008147ae 100644 --- a/content/en/docs/setup/pick-right-solution.md +++ b/content/en/docs/setup/pick-right-solution.md @@ -71,7 +71,7 @@ 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. -* [k3s](https://k3s.io) is a lightweight production-grade Kubernetes distribution. With a super-simple installation process and a binary foot print around 40MB, it is ideal for local-machine development. +* [k3s](https://k3s.io) is a lightweight production-grade Kubernetes distribution. With a super-simple installation process and a binary footprint around 40MB, it is ideal for local-machine development. * [Ubuntu on LXD](/docs/getting-started-guides/ubuntu/local/) supports a nine-instance deployment on localhost.