Created
September 1, 2020 12:15
-
-
Save oke-py/4f50be4640255bdde3be95dcda52787f to your computer and use it in GitHub Desktop.
git diff upstream/release-1.17 fb6364d <file>
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/content/en/docs/setup/_index.md b/content/en/docs/setup/_index.md | |
index 880dd4602..59db38425 100644 | |
--- a/content/en/docs/setup/_index.md | |
+++ b/content/en/docs/setup/_index.md | |
@@ -7,7 +7,7 @@ no_issue: true | |
title: Getting started | |
main_menu: true | |
weight: 20 | |
-content_template: templates/concept | |
+content_type: concept | |
card: | |
name: setup | |
weight: 20 | |
@@ -18,41 +18,22 @@ card: | |
title: Production environment | |
--- | |
-{{% capture overview %}} | |
+<!-- overview --> | |
-This section covers different options to set up and run Kubernetes. | |
+This section lists the different ways to set up and run Kubernetes. | |
+When you install Kubernetes, choose an installation type based on: ease of maintenance, security, | |
+control, available resources, and expertise required to operate and manage a cluster. | |
-Different Kubernetes solutions meet different requirements: ease of maintenance, security, control, available resources, and expertise required to operate and manage a cluster. | |
+You can deploy a Kubernetes cluster on a local machine, cloud, on-prem datacenter, or choose a managed Kubernetes cluster. There are also custom solutions across a wide range of cloud providers, or bare metal environments. | |
-You can deploy a Kubernetes cluster on a local machine, cloud, on-prem datacenter, or choose a managed Kubernetes cluster. You can also create custom solutions across a wide range of cloud providers, or bare metal environments. | |
- | |
-More simply, you can create a Kubernetes cluster in learning and production environments. | |
- | |
-{{% /capture %}} | |
- | |
-{{% capture body %}} | |
+<!-- body --> | |
## Learning environment | |
-If you're learning Kubernetes, use the Docker-based solutions: tools supported by the Kubernetes community, or tools in the ecosystem to set up a Kubernetes cluster on a local machine. | |
- | |
-{{< table caption="Local machine solutions table that lists the tools supported by the community and the ecosystem to deploy Kubernetes." >}} | |
- | |
-|Community |Ecosystem | | |
-| ------------ | -------- | | |
-| [Minikube](/docs/setup/learning-environment/minikube/) | [CDK on LXD](https://www.ubuntu.com/kubernetes/docs/install-local) | | |
-| [kind (Kubernetes IN Docker)](/docs/setup/learning-environment/kind/) | [Docker Desktop](https://www.docker.com/products/docker-desktop)| | |
-| | [Minishift](https://docs.okd.io/latest/minishift/)| | |
-| | [MicroK8s](https://microk8s.io/)| | |
-| | [IBM Cloud Private-CE (Community Edition)](https://github.com/IBM/deploy-ibm-cloud-private) | | |
-| | [IBM Cloud Private-CE (Community Edition) on Linux Containers](https://github.com/HSBawa/icp-ce-on-linux-containers)| | |
-| | [k3s](https://k3s.io)| | |
- | |
+If you're learning Kubernetes, use the tools supported by the Kubernetes community, or tools in the ecosystem to set up a Kubernetes cluster on a local machine. | |
## Production environment | |
When evaluating a solution for a production environment, consider which aspects of operating a Kubernetes cluster (or _abstractions_) you want to manage yourself or offload to a provider. | |
-For a list of [Certified Kubernetes](https://github.com/cncf/k8s-conformance/#certified-kubernetes) providers, see "[Partners](https://kubernetes.io/partners/#conformance)". | |
- | |
-{{% /capture %}} | |
+[Kubernetes Partners](https://kubernetes.io/partners/#conformance) includes a list of [Certified Kubernetes](https://github.com/cncf/k8s-conformance/#certified-kubernetes) providers. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment