diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-09-11 13:32:19 +0000 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-12 13:14:22 +0200 |
| commit | b0151a8dbe50265e186e46b8f0b67af585363ccb (patch) | |
| tree | 27115e308072e181b1a0cd4a3f59c5a8caf375e6 | |
| parent | 9db5bfb7e787c090df9aad23c86e2e08333258b2 (diff) | |
| download | gitlab-ce-b0151a8dbe50265e186e46b8f0b67af585363ccb.tar.gz | |
Merge branch '37647-follow-up-from-update-helm-chart-docs-from-ce-docs' into 'master'
Resolve Follow-up from Update Helm Chart docs from CE - docs
Closes #37647
See merge request !14166
# Conflicts:
# doc/install/kubernetes/index.md
| -rw-r--r-- | doc/install/kubernetes/index.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md index fb6c0c2d263..ebc9db7e182 100644 --- a/doc/install/kubernetes/index.md +++ b/doc/install/kubernetes/index.md @@ -15,8 +15,7 @@ There are also two other sets of charts: ## Official GitLab Helm Charts -These charts utilize our [GitLab Omnibus Docker images](https://docs.gitlab.com/omnibus/docker/README.html). You can report any issues and feedback related to these charts at -https://gitlab.com/charts/charts.gitlab.io/issues. +This chart is the best available way to operate GitLab on Kubernetes. It deploys and configures nearly all features of GitLab, including: a [Runner](https://docs.gitlab.com/runner/), [Container Registry](../../user/project/container_registry.html#gitlab-container-registry), [Mattermost](https://docs.gitlab.com/omnibus/gitlab-mattermost/), [automatic SSL](https://github.com/kubernetes/charts/tree/master/stable/kube-lego), and a [load balancer](https://github.com/kubernetes/ingress/tree/master/controllers/nginx). It is based on our [GitLab Omnibus Docker Images](https://docs.gitlab.com/omnibus/docker/README.html). ### Deploying GitLab on Kubernetes > **Note**: This chart will eventually be replaced by the [cloud native charts](#upcoming-cloud-native-helm-charts), which are presently in development. @@ -34,7 +33,7 @@ It offers a quick way to configure and deploy the Runner on Kubernetes, regardle ### Advanced deployment of GitLab > **Note**: This chart will be replaced by the [gitlab-omnibus](gitlab_omnibus.md) chart, once it supports [additional configuration options](https://gitlab.com/charts/charts.gitlab.io/issues/68). -If advanced configuration of GitLab is required, the beta [gitlab](gitlab_chart.md) chart can be used which deploys the GitLab service along with optional Postgres and Redis. It offers extensive configuration, but requires deep knowledge of Kubernetes and Helm to use. +If you already have a GitLab instance running, inside or outside of Kubernetes, and you'd like to leverage the Runner's [Kubernetes capabilities](https://docs.gitlab.com/runner/executors/kubernetes.html), it can be deployed with the GitLab Runner chart. For most deployments we recommend using our [gitlab-omnibus](gitlab_omnibus.md) chart. |