diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 00:08:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 00:08:51 +0300 |
| commit | e7f5f860cfb0281e17a4d80cbe8507486614320f (patch) | |
| tree | e4b5b67189108f45de8a85013f4ef369b909f2bb /doc/user | |
| parent | 7247395411759f832211b36f70dead50df3ea28b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/clusters/agent/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/clusters/index.md | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/doc/user/clusters/agent/index.md b/doc/user/clusters/agent/index.md index c59d2a1f61c..b180432b0a0 100644 --- a/doc/user/clusters/agent/index.md +++ b/doc/user/clusters/agent/index.md @@ -77,6 +77,8 @@ The setup process involves a few steps to enable GitOps deployments: 1. [Install the Agent into the cluster](#install-the-agent-into-the-cluster). 1. [Create manifest files](#create-manifest-files). +<i class="fa fa-youtube-play youtube" aria-hidden="true"></i> Watch a GitLab 14.2 [walking-through video](https://www.youtube.com/watch?v=XuBpKtsgGkE) with this process. + ### Upgrades and version compatibility As the GitLab Kubernetes Agent is a new product, we are constantly adding new features diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 850cef02614..eec67904476 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -54,21 +54,9 @@ Some GitLab features may support versions outside the range provided here. ## Add and remove clusters -You can create new or add existing clusters to GitLab through different levels, +You can create new or add existing clusters to GitLab through different [levels](#cluster-levels), using different methods. -### Cluster levels - -You can connect clusters to GitLab in different levels, according to their purpose: - -- On the project level, to have a cluster dedicated to a project. -- On the [group level](../../group/clusters/index.md), to use the same cluster across multiple projects within your group. -- On the [instance level](../../instance/clusters/index.md), to use the same cluster across multiple groups and projects. **(FREE SELF)** - -### Methods to create new clusters - -To create new clusters, we **recommend** using [Infrastructure as Code](../../infrastructure/index.md). - ### Methods to connect existing clusters To safely connect and configure an existing cluster on the **project level**, we @@ -80,6 +68,18 @@ You can use [cluster certificates](add_existing_cluster.md) to connect clusters in all levels (projects, group, instance). However, for [security implications](#security-implications), this method is no longer recommended. +### Methods to create new clusters + +To create new clusters, we **recommend** using [Infrastructure as Code](../../infrastructure/index.md). + +### Cluster levels + +You can connect clusters to GitLab in different levels, according to their purpose: + +- On the project level, to have a cluster dedicated to a project. +- On the [group level](../../group/clusters/index.md), to use the same cluster across multiple projects within your group. +- On the [instance level](../../instance/clusters/index.md), to use the same cluster across multiple groups and projects. **(FREE SELF)** + ## Security implications WARNING: |