summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-07-09 12:58:09 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2018-07-09 12:58:09 +0000
commitacdac151f51a9f719e7ebbdf7811c3460113a8fb (patch)
tree8ae003511d8e9ba464935e3948977a54e77ec229
parentf2db1e31423651df703d518fc9f56a3e4f3c553c (diff)
parent8c837a356737dfb6205c4e807c5ccc93c3593eb7 (diff)
downloadgitlab-ce-acdac151f51a9f719e7ebbdf7811c3460113a8fb.tar.gz
Merge branch 'docs/kubernetes-tiller' into 'master'fj-48043-instance-level-project-templates
Add note about the k8s namespace of installed applications See merge request gitlab-org/gitlab-ce!20423
-rw-r--r--doc/user/project/clusters/index.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 377e285a731..baa6efe50d5 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -153,6 +153,13 @@ GitLab provides a one-click install for various applications which will be
added directly to your configured cluster. Those applications are needed for
[Review Apps](../../../ci/review_apps/index.md) and [deployments](../../../ci/environments.md).
+NOTE: **Note:**
+The applications will be installed in a dedicated namespace called
+`gitlab-managed-apps`. In case you have added an existing Kubernetes cluster
+with Tiller already installed, you should be careful as GitLab cannot
+detect it. By installing it via the applications will result into having it
+twice, which can lead to confusion during deployments.
+
| Application | GitLab version | Description |
| ----------- | :------------: | ----------- |
| [Helm Tiller](https://docs.helm.sh/) | 10.2+ | Helm is a package manager for Kubernetes and is required to install all the other applications. It is installed in its own pod inside the cluster which can run the `helm` CLI in a safe environment. |