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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 09:09:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 09:09:38 +0300
commited9165c2abda1dca048a8d3cb8030d906c0bbb0c (patch)
tree226d7ad6b9abdc8d2534c3025b488ce9a754dee6 /doc/user/clusters
parentb4b9b3854eddd2a4829113ebfc1812c3a332a7d9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/clusters')
-rw-r--r--doc/user/clusters/applications.md9
-rw-r--r--doc/user/clusters/management_project.md4
2 files changed, 12 insertions, 1 deletions
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index 4768fcc2970..822868aeb35 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -588,6 +588,15 @@ output of the [Helm
Tiller](https://v2.helm.sh/docs/install/#running-tiller-locally) binary
will be saved as a [CI job artifact](../../ci/pipelines/job_artifacts.md).
+### Important notes
+
+Note the following:
+
+- When you set the value for `installed` key back to `false`, the application will be
+ unprovisioned from the cluster.
+- If you update `.gitlab/managed-apps/<application>/values.yaml` with new values, the
+ application will be redeployed.
+
### Install Ingress using GitLab CI
To install Ingress, define the `.gitlab/managed-apps/config.yaml` file
diff --git a/doc/user/clusters/management_project.md b/doc/user/clusters/management_project.md
index 5a5ab4dce05..562826eba65 100644
--- a/doc/user/clusters/management_project.md
+++ b/doc/user/clusters/management_project.md
@@ -14,7 +14,7 @@ privileges.
This can be useful for:
-- Creating pipelines to install cluster-wide applications into your cluster.
+- Creating pipelines to install cluster-wide applications into your cluster, see [Install using GitLab CI (alpha)](applications.md#install-using-gitlab-ci-alpha) for details.
- Any jobs that require `cluster-admin` privileges.
## Permissions
@@ -47,6 +47,8 @@ To select a cluster management project to use:
**Operations > Kubernetes** page.
- [Group-level cluster](../group/clusters/index.md), navigate to your group's **Kubernetes**
page.
+ - [Instance-level cluster](../instance/clusters/index.md), navigate to Admin Area's **Kubernetes**
+ page.
1. Select the project using **Cluster management project field** in the **Advanced settings**
section.