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:
authorTom Atkins <tatkins@gitlab.com>2018-11-21 01:28:28 +0300
committerTom Atkins <tatkins@gitlab.com>2018-11-21 01:28:28 +0300
commitc6b6878778429dfda4844bf486c3ea37b551823b (patch)
tree4957ea8efdfec754613f0d1609c52c47cd959fd2 /doc/install/kubernetes
parent233af8f1731734aaad7e5055af39f26c16608649 (diff)
Update doc/install/README.md, doc/install/kubernetes/index.md, doc/install/kubernetes/gitlab_chart.md files
Diffstat (limited to 'doc/install/kubernetes')
-rw-r--r--doc/install/kubernetes/gitlab_chart.md5
-rw-r--r--doc/install/kubernetes/index.md5
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md
index 3f5b36f7254..40c35fc4bb2 100644
--- a/doc/install/kubernetes/gitlab_chart.md
+++ b/doc/install/kubernetes/gitlab_chart.md
@@ -1,8 +1,11 @@
# GitLab Helm Chart
-This is the official and recommended way to install GitLab on a cloud native environment.
+This is the official way to install GitLab on a cloud native environment.
For more information on other available GitLab Helm Charts, see the [charts overview](index.md#chart-overview).
+TIP: **If in doubt, choose Omnibus:**
+For nearly all GitLab installations we recommend using an Omnibus package. **GitLab can support up to 40,000 users on a single box Omnibus installation** with enough CPU and RAM. (See [requirements documentation](requirements.md)). Before starting to install GitLab in Kubernetes, please read [Choose the best installation method for your needs](install/README.md)
+
## Introduction
The `gitlab` chart is the best way to operate GitLab on Kubernetes. This chart
diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md
index 69171fbb341..91810ae9f9d 100644
--- a/doc/install/kubernetes/index.md
+++ b/doc/install/kubernetes/index.md
@@ -4,6 +4,9 @@ description: 'Read through the different methods to deploy GitLab on Kubernetes.
# Installing GitLab on Kubernetes
+TIP: **If in doubt, choose Omnibus:**
+For nearly all GitLab installations we recommend using an Omnibus package. **GitLab can support up to 40,000 users on a single box Omnibus installation** with enough CPU and RAM. (See [requirements documentation](requirements.md)). Before starting to install GitLab in Kubernetes, please read [Choose the best installation method for your needs](install/README.md)
+
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
@@ -37,7 +40,7 @@ Learn more about [gitlab-runner chart](gitlab_runner_chart.md).
CAUTION: **Deprecated:**
These charts are **deprecated**. We recommend using the [GitLab Chart](gitlab_chart.md)
-instead.
+instead. (**Note:** Omnibus is still the recommended installation for most use cases - only the Omnibus Helm chart is deprecated.)
### GitLab-Omnibus Chart