diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-09-11 13:32:19 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-09-11 13:32:19 +0000 |
| commit | 90f83ca487cb64a5244709994e3220cfca2453d4 (patch) | |
| tree | 957c25fd0885aa1f08413c2f308ddf796e050289 | |
| parent | b22a48d5371887eaa32f286dced8cc8f16d29b55 (diff) | |
| parent | 4428a5fe08a48f3b985c8bd41b4223b0847eb855 (diff) | |
| download | gitlab-ce-90f83ca487cb64a5244709994e3220cfca2453d4.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
| -rw-r--r-- | doc/install/kubernetes/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md index c799f88ad74..467d5b92e0c 100644 --- a/doc/install/kubernetes/index.md +++ b/doc/install/kubernetes/index.md @@ -19,7 +19,7 @@ should be deployed, upgraded, and configured. ## GitLab-Omnibus Chart (Recommended) > **Note**: This chart is in beta while [additional features](https://gitlab.com/charts/charts.gitlab.io/issues/68) are being added. -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](https://docs.gitlab.com/ee/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). +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). Once the [cloud native charts](#upcoming-cloud-native-helm-charts) are ready for production use, this chart will be deprecated. Due to the difficulty in supporting upgrades to the new architecture, migrating will require exporting data out of this instance and importing it into the new deployment. @@ -41,7 +41,7 @@ This is a large project and will be worked on over the span of multiple releases ### GitLab Runner Chart -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://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/executors/kubernetes.md), it can be deployed with the GitLab Runner chart. +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. Learn more about [gitlab-runner chart.](gitlab_runner_chart.md) |