summaryrefslogtreecommitdiff
path: root/doc/install/kubernetes/index.md
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-08-10 17:40:00 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-08-10 17:40:00 +0000
commit6160bc7f5ec23f4c24e79c7c1b81a688413ecc92 (patch)
tree97e41191329c5403810503a3a60c2e623fb1da11 /doc/install/kubernetes/index.md
parentb1ae717de64eee22266be4c46807009b16c64ba9 (diff)
downloadgitlab-ce-6160bc7f5ec23f4c24e79c7c1b81a688413ecc92.tar.gz
Document new all-in-one Helm chart - docs
Diffstat (limited to 'doc/install/kubernetes/index.md')
-rw-r--r--doc/install/kubernetes/index.md13
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md
index 5ea08869a9b..3608aa6b2d6 100644
--- a/doc/install/kubernetes/index.md
+++ b/doc/install/kubernetes/index.md
@@ -1,7 +1,7 @@
# Installing GitLab on Kubernetes
-> Officially supported cloud providers are Google Container Service and Azure Container Service.
+> These Helm charts are in beta. GitLab is working on a [cloud-native](http://docs.gitlab.com/omnibus/package-information/cloud_native.html) set of [Charts](https://gitlab.com/charts/helm.gitlab.io) which will replace these.
-> Officially supported schedulers are Kubernetes, Terraform and Tectonic.
+> Officially supported cloud providers are Google Container Service and Azure Container Service.
The easiest method to deploy GitLab in [Kubernetes](https://kubernetes.io/) is
to take advantage of the official GitLab Helm charts. [Helm] is a package
@@ -35,12 +35,11 @@ helm init
## Using the GitLab Helm Charts
-GitLab makes available two Helm Charts, one for the GitLab server and another
-for the Runner. More detailed information on installing and configuring each
-Chart can be found below:
+GitLab makes available three Helm Charts: an easy to use bundled chart, and a specific chart for GitLab itself and the Runner.
-- [Install GitLab](gitlab_chart.md)
-- [Install GitLab Runner](gitlab_runner_chart.md)
+- [gitlab-omnibus](gitlab_omnibus.md): The easiest way to get started. Includes everything needed to run GitLab, including: a Runner, Container Registry, automatic SSL, and an Ingress.
+- [gitlab](gitlab_chart.md): Just the GitLab service, with optional Postgres and Redis.
+- [gitlab-runner](gitlab_runner_chart.md): GitLab Runner, to process CI jobs.
[chart]: https://github.com/kubernetes/charts
[helm-quick]: https://github.com/kubernetes/helm/blob/master/docs/quickstart.md