Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-09-10 14:16:33 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2018-09-10 14:16:33 +0300
commit4a5f98b2fa679a6f1d0263635e0bcda346aa25d8 (patch)
tree53966988e2fe9295d4aa2086da0f6b523141dab2
parent909bfca7a589d3f41b80617277748d470945dc10 (diff)
parent63d05c52abab5c15e13b4d352d9705367e2c89bf (diff)
Merge branch 'improve-chart-index-docs' into 'master'
Clean up chart index page See merge request gitlab-org/gitlab-ce!21623
-rw-r--r--doc/install/kubernetes/index.md23
1 files changed, 6 insertions, 17 deletions
diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md
index e67d5ba4d4c..df74d2aeab3 100644
--- a/doc/install/kubernetes/index.md
+++ b/doc/install/kubernetes/index.md
@@ -4,23 +4,12 @@ description: 'Read through the different methods to deploy GitLab on Kubernetes.
# Installing GitLab on Kubernetes
-NOTE: **Note**: These charts have been tested on Google Kubernetes Engine. Other
-Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/issues).
-
The easiest method to deploy GitLab on [Kubernetes](https://kubernetes.io/) is
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.
-## Chart Overview
-
-- **[GitLab Chart](gitlab_chart.html)**: Deploys GitLab on Kubernetes. Includes all the required components to get started, and can scale to large deployments.
-- **[GitLab Runner Chart](gitlab_runner_chart.md)**: For deploying just the GitLab Runner.
-- Other Charts
- - [GitLab-Omnibus](gitlab_omnibus.md): Chart based on the Omnibus GitLab package, only suitable for small deployments. Deprecated, we strongly recommend using the [gitlab](#gitlab-chart) chart.
- - [Community contributed charts](#community-contributed-charts): Community contributed charts.
-
## GitLab Chart
This chart contains all the required components to get started, and can scale to
@@ -43,13 +32,13 @@ it can be deployed with the GitLab Runner chart.
Learn more about [gitlab-runner chart](gitlab_runner_chart.md).
-## Other Charts
-
-### GitLab-Omnibus Chart
+## Deprecated Charts
CAUTION: **Deprecated:**
-This chart is **deprecated**. We recommend using the [GitLab Chart](gitlab_chart.md)
-instead. A comparison of the two charts is available in [this video](https://youtu.be/Z6jWR8Z8dv8).
+These charts are **deprecated**. We recommend using the [GitLab Chart](gitlab_chart.md)
+instead.
+
+### GitLab-Omnibus Chart
This chart is based on the [GitLab Omnibus Docker images](https://docs.gitlab.com/omnibus/docker/).
It deploys and configures nearly all features of GitLab, including:
@@ -64,7 +53,7 @@ Learn more about the [gitlab-omnibus chart](gitlab_omnibus.md).
### Community Contributed Charts
-The community has also contributed GitLab [CE](https://github.com/kubernetes/charts/tree/master/stable/gitlab-ce) and [EE](https://github.com/kubernetes/charts/tree/master/stable/gitlab-ee) charts to the [Helm Stable Repository](https://github.com/kubernetes/charts#repository-structure). These charts should be considered [deprecated](https://github.com/kubernetes/charts/issues/1138) in favor of the [official Charts](gitlab_omnibus.md).
+The community has also contributed GitLab [CE](https://github.com/kubernetes/charts/tree/master/stable/gitlab-ce) and [EE](https://github.com/kubernetes/charts/tree/master/stable/gitlab-ee) charts to the [Helm Stable Repository](https://github.com/kubernetes/charts#repository-structure). These charts are [deprecated](https://github.com/kubernetes/charts/issues/1138) in favor of the [official Chart](gitlab_chart.md).
[chart]: https://github.com/kubernetes/charts
[helm]: https://github.com/kubernetes/helm/blob/master/README.md