summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Atkins <tatkins@gitlab.com>2018-11-21 13:57:49 +0000
committerTom Atkins <tatkins@gitlab.com>2018-11-21 13:57:49 +0000
commit0341cfd63efcfee7422f67dd3a83df1cf392740c (patch)
treea371418382c407c0c239a74c006f5b6247c1a845
parent89230a83447ca6231c62fe5fbf33347039941d5f (diff)
downloadgitlab-ce-tatkins-installation-method-docs.tar.gz
Fix typo and broken link refstatkins-installation-method-docs
-rw-r--r--doc/install/README.md6
-rw-r--r--doc/install/kubernetes/gitlab_chart.md2
-rw-r--r--doc/install/kubernetes/index.md2
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/install/README.md b/doc/install/README.md
index 3f319189337..66a1941de60 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -7,7 +7,7 @@ description: Read through the GitLab installation methods.
## Requirements
-Before installing GitLab, make sure to check the [requirements documentation](requirements.md)
+Before installing GitLab, make sure to check the [requirements documentation](install/requirements.md)
which includes useful information on the supported Operating Systems as well as
the hardware requirements.
@@ -23,7 +23,7 @@ To get the best experience from GitLab you need to balance:
1. cost of hosting
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))
+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](install/requirements.md))
### Omnibus (recommended)
@@ -53,7 +53,7 @@ GitLab is committed to Kubernetes as a foundational technology. There are three
While we recommend using GitLab for the first two points above, for most scenarios we do not currently recommend installing GitLab in Kubernetes. There are a number of trade-offs that you need to be aware of that may not be immediately obvious and could prevent you getting the best experience from GitLab:
-1. Configuration of feature such as object storage, backups and certificates can be more challenging
+1. Configuration of features such as object storage, backups and certificates can be more challenging
1. Administration and troubleshooting requires Kubernetes knowledge
1. It can be more expensive for smaller installations. You need multiple nodes for a basic installation when a single box Omnibus installation would work well
1. There are some feature [limitations to be aware of](install/kubernetes/gitlab_chart.md#limitations)
diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md
index 40c35fc4bb2..d3a3bb16603 100644
--- a/doc/install/kubernetes/gitlab_chart.md
+++ b/doc/install/kubernetes/gitlab_chart.md
@@ -4,7 +4,7 @@ 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)
+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](install/requirements.md)). Before starting to install GitLab in Kubernetes, please read [Choose the best installation method for your needs](install/README.md)
## Introduction
diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md
index 91810ae9f9d..2c44437d74d 100644
--- a/doc/install/kubernetes/index.md
+++ b/doc/install/kubernetes/index.md
@@ -5,7 +5,7 @@ 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)
+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](install/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