diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-11 14:27:19 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-11 21:57:15 +0300 |
| commit | 782378e2e9d6ddabae79819521723eefd31b0c19 (patch) | |
| tree | 747b0a109319b0e29c597e62f904acb0eda50309 /doc/user | |
| parent | 7b030bcd6b4b435e9d9f510a0c7b6e25c76a3ba8 (diff) | |
Merge branch 'gcp-fix' into 'master'
Fix GCP redirect
Closes #41867
See merge request gitlab-org/gitlab-ce!16355
(cherry picked from commit 59adc07f00f4f3ea326194d77c31580edfdfb2a4)
b44583e9 Extract GCP billing check as method
cf6258af Fix billing checking
0cdd56e6 Fix link to billing
e52bae3b Fix CheckGcpProjectBillingService spec
b8b2f5ff Fix CheckGcpProjectBillingWorker spec
8ba3e473 Fix GCP Controller spec
1f0a4fe6 Add missing user agent header to GCP client
6ef28ace Add API requirements to docs
0b294fc2 Use new tab for link in flash
cf95756a Refactor GCP redirect test suite
e6012d3e Change failed GCP billing check wording
35598274 Fix breadcumb of clusters show page
cf842986 Update links for GCP instructions
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/clusters/index.md | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index d5619c7b563..218b9dee41d 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -25,11 +25,14 @@ prerequisites must be met: be enabled in GitLab at the instance level. If that's not the case, ask your administrator to enable it. - Your associated Google account must have the right privileges to manage - clusters on GKE. That would mean that a - [billing account](https://cloud.google.com/billing/docs/how-to/manage-billing-account) - must be set up. -- You must have Master [permissions] in order to be able to access the **Cluster** - page. + clusters on GKE. That would mean that a [billing + account](https://cloud.google.com/billing/docs/how-to/manage-billing-account) + must be set up and that you have to have permissions to access it. +- You must have Master [permissions] in order to be able to access the + **Cluster** page. +- You must have [Cloud Billing API](https://cloud.google.com/billing/) enabled +- You must have [Resource Manager + API](https://cloud.google.com/resource-manager/) If all of the above requirements are met, you can proceed to add a new GKE cluster. |