summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Downes <tpdownes@gmail.com>2018-04-27 03:12:47 +0000
committerTom Downes <thomas.downes@ligo.org>2018-05-02 11:24:02 -0500
commitc3836b9e45f8ad8609e80ff09f96f03d2634b507 (patch)
treead38dc0b41e71df2f217453edb2114af8e567265
parentc7c9f38d01938963a8cdf7f5a3bd12ea53e22e59 (diff)
downloadgitlab-ce-c3836b9e45f8ad8609e80ff09f96f03d2634b507.tar.gz
Update google.md to reflect need for Google+ API for oauth integration;
clarify need for Kubernetes Engine API is only necessary for CI/CD integration with GKE
-rw-r--r--doc/integration/google.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/integration/google.md b/doc/integration/google.md
index ae1d848f439..8906f91b6b4 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -35,7 +35,12 @@ In Google's side:
1. You should now be able to see a Client ID and Client secret. Note them down
or keep this page open as you will need them later.
-1. From the **Dashboard** select **ENABLE APIS AND SERVICES > Compute > Google Kubernetes Engine API > Enable**
+1. From the **Dashboard** select **ENABLE APIS AND SERVICES > Compute > Google+ API > Enable**
+1. To enable projects to access [Google Kubernetes Engine](../user/project/clusters/index.md), you must also
+ enable these APIs:
+ - Google Kubernetes Engine API
+ - Cloud Resource Manager API
+ - Cloud Billing API
On your GitLab server: