summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-08-28 14:18:25 -0400
committerJoshua Lambert <joshua@gitlab.com>2017-08-28 14:18:25 -0400
commitfe5b30140c6d0415c6b3a1bee84265c3c7ef63bc (patch)
tree7176098485814eb32a953e7f1f2a5fff0a7ddd63 /doc
parentbe925c0c75471120ebcf390d3339bd64575d5e69 (diff)
downloadgitlab-ce-fe5b30140c6d0415c6b3a1bee84265c3c7ef63bc.tar.gz
WIP update to index page
Diffstat (limited to 'doc')
-rw-r--r--doc/install/kubernetes/index.md33
1 files changed, 20 insertions, 13 deletions
diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md
index d5ea81b13df..5177f4adc44 100644
--- a/doc/install/kubernetes/index.md
+++ b/doc/install/kubernetes/index.md
@@ -1,28 +1,35 @@
# Installing GitLab on Kubernetes
-> These Helm charts are in beta. GitLab is working on a [cloud-native set of Charts](https://gitlab.com/charts/helm.gitlab.io/blob/master/README.md) which will replace these.
-
> 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
+to take advantage of GitLab's Helm charts. [Helm] is a package
management tool for Kubernetes, allowing apps to be easily managed via their
Charts. A [Chart] is a detailed description of the application including how it
should be deployed, upgraded, and configured.
-The GitLab Helm repository is located at https://charts.gitlab.io.
-You can report any issues related to GitLab's Helm Charts at
-https://gitlab.com/charts/charts.gitlab.io/issues.
-Contributions and improvements are also very welcome.
+GitLab provides [official Helm Charts](#official-gitlab-helm-charts-recommended) which is the recommended way to run GitLab with Kubernetes.
+
+There are also two other sets of GitLab Helm Charts:
+* Our [upcoming cloud native Charts](#upcoming-cloud-native-helm-charts), which are in development but will eventually replace the current official charts.
+* [Community contributed charts](#community-contributed-charts).
+
+## Official GitLab Helm Charts (Recommended)
+> Note: These charts will eventually be replaced by the [cloud-native charts](https://gitlab.com/charts/helm.gitlab.io/), which are presently in development.
-## Using the GitLab Helm Charts
+The best way to deploy GitLab on Kubernetes is to use the [gitlab-omnibus](gitlab_omnibus.md) chart. It includes everything needed to run GitLab, including: a [Runner](https://docs.gitlab.com/runner/), [Container Registry](https://docs.gitlab.com/ee/user/project/container_registry.html#gitlab-container-registry), [automatic SSL](https://github.com/kubernetes/charts/tree/master/stable/kube-lego), and an [Ingress](https://github.com/kubernetes/ingress/tree/master/controllers/nginx).
+
+To deploy just the GitLab Runner, utilize the [gitlab-runner](gitlab_runner_chart.md) chart. It offers a quick way to configure and deploy the Runner on Kubernetes, regardless of where your GitLab server may be running.
+
+If advanced configuration of GitLab is required, the [gitlab](gitlab_chart.md) chart can be used which deploys the GitLab service along with optional Posgres and Redis. It offers extensive configuration options some of which may not yet be available in the `gitlab-omnibus` chart, but requires deep knowledge of Kubernetes and Helm to use.
+
+These charts utilize our [GitLab Omnibus Docker images](https://docs.gitlab.com/omnibus/docker/README.html). You can report any issues and feedback related these charts at
+https://gitlab.com/charts/charts.gitlab.io/issues.
-GitLab makes available three Helm Charts.
+## Upcoming Cloud Native Helm Charts
-- [gitlab-omnibus](gitlab_omnibus.md): **Recommended** and the easiest way to get started. Includes everything needed to run GitLab, including: a [Runner](https://docs.gitlab.com/runner/), [Container Registry](https://docs.gitlab.com/ee/user/project/container_registry.html#gitlab-container-registry), [automatic SSL](https://github.com/kubernetes/charts/tree/master/stable/kube-lego), and an [Ingress](https://github.com/kubernetes/ingress/tree/master/controllers/nginx).
-- [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.
+GitLab is working towards a building a [cloud native deployment model](https://gitlab.com/charts/helm.gitlab.io/blob/master/README.md). A key part of this is to isolate each service into it's [own Docker container and Helm chart](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2420), rather than utilizing the all-in-one container image of the [current charts](#official-gitlab-helm-charts-recommended).
-We are also working on a new set of [cloud native Charts](https://gitlab.com/charts/helm.gitlab.io) which will eventually replace these.
+## Community Contributed Helm Charts
[chart]: https://github.com/kubernetes/charts
[helm]: https://github.com/kubernetes/helm/blob/master/README.md