From 3c29804ea484f562da8454a2c43cc01bba1f4eaa Mon Sep 17 00:00:00 2001 From: Tim Van Steenburgh Date: Thu, 19 Oct 2017 16:07:37 -0400 Subject: [PATCH 1/2] Add conjure-up to Turnkey Cloud Solutions list --- docs/setup/pick-right-solution.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/setup/pick-right-solution.md b/docs/setup/pick-right-solution.md index 01f17a1dd7dd8..b1ee0fe92105c 100644 --- a/docs/setup/pick-right-solution.md +++ b/docs/setup/pick-right-solution.md @@ -62,6 +62,7 @@ a Kubernetes cluster from scratch. 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 Canonical Kubernetes on AWS, Azure, Google Cloud, Oracle Cloud](/docs/getting-started-guides/ubuntu/) * [Google Compute Engine (GCE)](/docs/getting-started-guides/gce/) * [AWS](/docs/getting-started-guides/aws/) * [Azure](/docs/getting-started-guides/azure/) From e437e3e6fde363e1397a63bdd79cd5b3e0251aa9 Mon Sep 17 00:00:00 2001 From: Tim Van Steenburgh Date: Thu, 19 Oct 2017 16:23:44 -0400 Subject: [PATCH 2/2] Changed wording slightly --- docs/setup/pick-right-solution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup/pick-right-solution.md b/docs/setup/pick-right-solution.md index b1ee0fe92105c..5b08f53daed52 100644 --- a/docs/setup/pick-right-solution.md +++ b/docs/setup/pick-right-solution.md @@ -62,7 +62,7 @@ a Kubernetes cluster from scratch. 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 Canonical Kubernetes on AWS, Azure, Google Cloud, Oracle Cloud](/docs/getting-started-guides/ubuntu/) +* [Conjure-up Kubernetes with Ubuntu on AWS, Azure, Google Cloud, Oracle Cloud](/docs/getting-started-guides/ubuntu/) * [Google Compute Engine (GCE)](/docs/getting-started-guides/gce/) * [AWS](/docs/getting-started-guides/aws/) * [Azure](/docs/getting-started-guides/azure/)