summaryrefslogtreecommitdiff
path: root/doc/user/group
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-05 03:06:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-05 03:06:09 +0000
commit39a48637e52c4afc58341edfb10167947d961b33 (patch)
treea62a2e5c23a686ca6ed3d11d08672add9b94c4d8 /doc/user/group
parent8258d478ba2c4cb59eebc46755856b36251977d4 (diff)
downloadgitlab-ce-39a48637e52c4afc58341edfb10167947d961b33.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/group')
-rw-r--r--doc/user/group/clusters/index.md13
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/user/group/clusters/index.md b/doc/user/group/clusters/index.md
index d3a3a1ea283..1fe456902a2 100644
--- a/doc/user/group/clusters/index.md
+++ b/doc/user/group/clusters/index.md
@@ -61,10 +61,15 @@ managed by GitLab, resources for your projects will be automatically created. Se
[Access controls](../../project/clusters/add_remove_clusters.md#access-controls) section for details on which resources will
be created.
-If you choose to manage your own cluster, project-specific resources will not be created
-automatically. If you are using [Auto DevOps](../../../topics/autodevops/index.md), you will
-need to explicitly provide the `KUBE_NAMESPACE` [deployment variable](../../project/clusters/index.md#deployment-variables)
-that will be used by your deployment jobs.
+For clusters not managed by GitLab, project-specific resources will not be created
+automatically. If you are using [Auto DevOps](../../../topics/autodevops/index.md)
+for deployments with a cluster not managed by GitLab, you must ensure:
+
+- The project's deployment service account has permissions to deploy to
+ [`KUBE_NAMESPACE`](../../project/clusters/index.md#deployment-variables).
+- `KUBECONFIG` correctly reflects any changes to `KUBE_NAMESPACE`
+ (this is [not automatic](https://gitlab.com/gitlab-org/gitlab/issues/31519)). Editing
+ `KUBE_NAMESPACE` directly is discouraged.
NOTE: **Note:**
If you [install applications](#installing-applications) on your cluster, GitLab will create