diff options
| author | Evan Read <eread@gitlab.com> | 2019-05-20 16:51:52 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-05-20 16:51:52 +0000 |
| commit | 961a5f72f7f043540bf6e391edc3789a519f58bd (patch) | |
| tree | 277caf92e4582963c2a91ca245f9441e027b60a1 | |
| parent | 0463167c22c5413ac85e002f18f0957865e901f1 (diff) | |
| parent | c42aaec33e12f5be06403d7ff656d9083385df3d (diff) | |
| download | gitlab-ce-961a5f72f7f043540bf6e391edc3789a519f58bd.tar.gz | |
Merge branch 'docs-instance_level_clusters' into 'master'
Initial instance level cluster docs
See merge request gitlab-org/gitlab-ce!27873
| -rw-r--r-- | doc/user/group/clusters/index.md | 8 | ||||
| -rw-r--r-- | doc/user/instance/clusters/index.md | 23 | ||||
| -rw-r--r-- | doc/user/project/clusters/index.md | 6 |
3 files changed, 31 insertions, 6 deletions
diff --git a/doc/user/group/clusters/index.md b/doc/user/group/clusters/index.md index 53c82169e15..ff6aa4f5930 100644 --- a/doc/user/group/clusters/index.md +++ b/doc/user/group/clusters/index.md @@ -5,10 +5,10 @@ ## Overview -Similar to [project Kubernetes -clusters](../../project/clusters/index.md), Group-level Kubernetes -clusters allow you to connect a Kubernetes cluster to your group, -enabling you to use the same cluster across multiple projects. +Similar to [project-level](../../project/clusters/index.md) and +[instance-level](../../instance/clusters/index.md) Kubernetes clusters, +group-level Kubernetes clusters allow you to connect a Kubernetes cluster to +your group, enabling you to use the same cluster across multiple projects. ## Installing applications diff --git a/doc/user/instance/clusters/index.md b/doc/user/instance/clusters/index.md new file mode 100644 index 00000000000..894f83d3c75 --- /dev/null +++ b/doc/user/instance/clusters/index.md @@ -0,0 +1,23 @@ +# Instance-level Kubernetes clusters + +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/39840) in GitLab 11.11. +> Instance-level cluster integration is currently in [Beta](https://about.gitlab.com/handbook/product/#alpha-beta-ga). + +## Overview + +Similar to [project-level](../../project/clusters/index.md) +and [group-level](../../group/clusters/index.md) Kubernetes clusters, +instance-level Kubernetes clusters allow you to connect a Kubernetes cluster to +the GitLab instance, which enables you to use the same cluster across multiple +projects. + +## Cluster precedence + +GitLab will try match to clusters in the following order: + +- Project-level clusters +- Group-level clusters +- Instance level + +To be selected, the cluster must be enabled and +match the [environment selector](../../../ci/environments.md#scoping-environments-with-specs-premium). diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index afad8f0fa9d..e60317bc199 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -19,8 +19,10 @@ or provide the credentials to an [existing Kubernetes cluster](#adding-an-existi NOTE: **Note:** From [GitLab 11.6](https://gitlab.com/gitlab-org/gitlab-ce/issues/34758) you -can also associate a Kubernetes cluster to your groups. Learn more about -[group Kubernetes clusters](../../group/clusters/index.md). +can also associate a Kubernetes cluster to your groups and from +[GitLab 11.11](https://gitlab.com/gitlab-org/gitlab-ce/issues/39840), +to the GitLab instance. Learn more about [group-level](../../group/clusters/index.md) +and [instance-level](../../instance/clusters/index.md) Kubernetes clusters. ## Adding and creating a new GKE cluster via GitLab |