diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-06-18 04:11:48 +0300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-18 04:11:48 +0300 |
| commit | db9ef69272155b3c8ead5c0e7d027bda2b623d43 (patch) | |
| tree | f95645eb6a20e0613c5f4d02b01bb4a34ee5205c /doc | |
| parent | 1276ff85453c6331e53f79680627c981b5ef00f7 (diff) | |
| parent | 5aa9b710be2e03b296b68942d4053fa0a24e884c (diff) | |
Merge branch '60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters' into 'master'
Allow switching clusters between managed/unmanaged
Closes #60617
See merge request gitlab-org/gitlab-ce!29322
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/group/clusters/index.md | 4 | ||||
| -rw-r--r-- | doc/user/project/clusters/index.md | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/doc/user/group/clusters/index.md b/doc/user/group/clusters/index.md index 3c5e820c1ca..26d764fa2cf 100644 --- a/doc/user/group/clusters/index.md +++ b/doc/user/group/clusters/index.md @@ -57,10 +57,6 @@ differentiate the new cluster from the rest. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011) in GitLab 11.5. > Became [optional](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26565) in GitLab 11.11. -NOTE: **Note:** -Only available when creating clusters. Existing clusters not managed by GitLab -cannot become GitLab-managed later. - You can choose to allow GitLab to manage your cluster for you. If your cluster is managed by GitLab, resources for your projects will be automatically created. See the [Access controls](../../project/clusters/index.md#access-controls) section for details on which resources will diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index dc21db603d6..181b20dc710 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -225,10 +225,6 @@ applications running on the cluster. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011) in GitLab 11.5. > Became [optional](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26565) in GitLab 11.11. -NOTE: **Note:** -Only available when creating clusters. Existing clusters not managed by GitLab -cannot become GitLab-managed later. - You can choose to allow GitLab to manage your cluster for you. If your cluster is managed by GitLab, resources for your projects will be automatically created. See the [Access controls](#access-controls) section for details on which resources will |