diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-11 06:06:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-11 06:06:13 +0300 |
commit | a58529a3f5fd72290a93f81eb66c26a2589f3ef7 (patch) | |
tree | 133027dec476af1bd5711b7d02e2feba638acbde /doc/user/project/clusters/add_remove_clusters.md | |
parent | 991a295378736c60d419c794f0accbf0336987fc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/clusters/add_remove_clusters.md')
-rw-r--r-- | doc/user/project/clusters/add_remove_clusters.md | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/doc/user/project/clusters/add_remove_clusters.md b/doc/user/project/clusters/add_remove_clusters.md index 85f276ae5f9..549dd4dd916 100644 --- a/doc/user/project/clusters/add_remove_clusters.md +++ b/doc/user/project/clusters/add_remove_clusters.md @@ -119,7 +119,7 @@ GitLab supports: - Creating a new GKE cluster using the GitLab UI. - Providing credentials to add an [existing Kubernetes cluster](#add-existing-cluster). -Starting from [GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/issues/25925), all the GKE clusters provisioned by GitLab are [VPC-Native](https://cloud.google.com/kubernetes-engine/docs/how-to/alias-ips). +Starting from [GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/issues/25925), all the GKE clusters provisioned by GitLab are [VPC-native](https://cloud.google.com/kubernetes-engine/docs/how-to/alias-ips). NOTE: **Note:** The [Google authentication integration](../../../integration/google.md) must @@ -281,6 +281,19 @@ To add an existing Kubernetes cluster to your project: kubectl apply -f gitlab-admin-service-account.yaml ``` + You will need the `container.clusterRoleBindings.create` permission + to create cluster-level roles. If you do not have this permission, + you can alternatively enable Basic Authentication and then run the + `kubectl apply` command as an admin: + + ```bash + kubectl apply -f gitlab-admin-service-account.yaml --username=admin --password=<password> + ``` + + NOTE: **Note:** + Basic Authentication can be turned on and the password credentials + can be obtained using the Google Cloud Console. + Output: ```bash |