Skip to content

Commit

Permalink
fix minishift wording, remove broken link (kubernetes#12679)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bradamant3 authored and Kevin Wiesmüller committed Feb 28, 2019
1 parent 7a6e774 commit 4991340
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions content/en/docs/setup/pick-right-solution.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ easy-to-install application for your Mac or Windows environment that enables you
start coding and deploying in containers in minutes on a single-node Kubernetes
cluster.

* [Minishift](https://docs.okd.io/latest/minishift/) installs the community version of the Kubernetes enterprise platform OpenShift for local development & testing. It offers an All-In-One VM (`minishift start`) for Windows, macOS and Linux and the containeriz based `oc cluster up` (Linux only) and [comes with some easy to install Add Ons](https://github.com/minishift/minishift-addons/tree/master/add-ons).
* [Minishift](https://docs.okd.io/latest/minishift/) installs the community version of the Kubernetes enterprise platform OpenShift for local development & testing. It offers an all-in-one VM (`minishift start`) for Windows, macOS, and Linux. The container start is based on `oc cluster up` (Linux only). You can also install [the included add-ons](https://github.com/minishift/minishift-addons/tree/master/add-ons).

* [MicroK8s](https://microk8s.io/) provides a single command installation of the latest Kubernetes release on a local machine for development and testing. Setup is quick, fast (~30 sec) and supports many plugins including Istio with a single command.

Expand Down Expand Up @@ -157,13 +157,10 @@ it will be easier than starting from scratch. If you do want to start from scrat
have special requirements, or just because you want to understand what is underneath a Kubernetes
cluster, try the [Getting Started from Scratch](/docs/setup/scratch/) guide.

If you are interested in supporting Kubernetes on a new platform, see
[Writing a Getting Started Guide](https://git.k8s.io/community/contributors/devel/writing-a-getting-started-guide.md).

### Universal

If you already have a way to configure hosting resources, use
[kubeadm](/docs/setup/independent/create-cluster-kubeadm/) to easily bring up a cluster
[kubeadm](/docs/setup/independent/create-cluster-kubeadm/) to bring up a cluster
with a single command per machine.

### Cloud
Expand Down

0 comments on commit 4991340

Please sign in to comment.