summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-01-21 16:32:49 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-01-21 16:32:49 +0000
commit227ce776dcdaac35f6509d32428312ff0053de06 (patch)
treed14a30254854774db2616ba13e5654485ba0238b /doc
parentc2faab8d873e23577530b7dcdec6842dcbe1631e (diff)
parenta103beed59ad1b0a0d293259465217e851aef298 (diff)
downloadgitlab-ce-227ce776dcdaac35f6509d32428312ff0053de06.tar.gz
Merge branch 'docs/default-rbac' into 'master'
Add note about default See merge request gitlab-org/gitlab-ce!24445
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/clusters/index.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 6f334af4fb7..bb815695cb1 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -178,8 +178,11 @@ When creating a cluster in GitLab, you will be asked if you would like to create
[Attribute-based access control (ABAC)](https://kubernetes.io/docs/admin/authorization/abac/) cluster, or
a [Role-based access control (RBAC)](https://kubernetes.io/docs/admin/authorization/rbac/) one.
-Whether ABAC or RBAC is enabled, GitLab will create the necessary
-service accounts and privileges in order to install and run
+NOTE: **Note:**
+[RBAC](#role-based-access-control-rbac) is recommended and the GitLab default.
+
+Whether [ABAC](#attribute-based-access-control-abac) or [RBAC](#role-based-access-control-rbac) is enabled,
+GitLab will create the necessary service accounts and privileges in order to install and run
[GitLab managed applications](#installing-applications):
- If GitLab is creating the cluster, a `gitlab` service account with