Skip to content

Commit

Permalink
Add ICP to Pick Right Solutions table (kubernetes#12604)
Browse files Browse the repository at this point in the history
  • Loading branch information
stacyped authored and yagonobre committed Mar 14, 2019
1 parent e5e10a7 commit f269cd8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions content/en/docs/setup/pick-right-solution.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ a Kubernetes cluster from scratch.

* [Minikube](/docs/setup/minikube/) is a 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.

* [Docker Desktop](https://www.docker.com/products/docker-desktop) is an
easy-to-install application for your Mac or Windows environment that enables you to
* [Docker Desktop](https://www.docker.com/products/docker-desktop) is an
easy-to-install application for your Mac or Windows environment that enables you to
start coding and deploying in containers in minutes on a single-node Kubernetes
cluster.

Expand Down Expand Up @@ -216,6 +216,7 @@ IaaS Provider | Config. Mgmt. | OS | Networking | Docs
any | any | multi-support | any CNI | [docs](/docs/setup/independent/create-cluster-kubeadm/) | Project ([SIG-cluster-lifecycle](https://git.k8s.io/community/sig-cluster-lifecycle))
Google Kubernetes Engine | | | GCE | [docs](https://cloud.google.com/kubernetes-engine/docs/) | Commercial
Docker Enterprise | custom | [multi-support](https://success.docker.com/article/compatibility-matrix) | [multi-support](https://docs.docker.com/ee/ucp/kubernetes/install-cni-plugin/) | [docs](https://docs.docker.com/ee/) | Commercial
IBM Cloud Private | Ansible | multi-support | multi-support | [docs](https://www.ibm.com/support/knowledgecenter/SSBS6K/product_welcome_cloud_private.html) | [Commercial](https://www.ibm.com/mysupport/s/topic/0TO500000001o0fGAA/ibm-cloud-private?language=en_US&productId=01t50000004X1PWAA0) and [Community](https://www.ibm.com/support/knowledgecenter/SSBS6K_3.1.2/troubleshoot/support_types.html) |
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
AppsCode.com | Saltstack | Debian | multi-support | [docs](https://appscode.com/products/cloud-deployment/) | Commercial
Expand Down

0 comments on commit f269cd8

Please sign in to comment.