From 0b9af6848e8f546f1f79afbc4b885896253bfa4d Mon Sep 17 00:00:00 2001 From: Alexander Apalikov Date: Fri, 1 Mar 2019 15:54:12 +0300 Subject: [PATCH] Switch to using default gke-cluster oauthScopes Verified that we can change oauthScope nodePool settings to gke-defaults. Tests test-e2e, metrics and logs works as before. --- build/gke-test-cluster/cluster-e2e.yml | 4 +++- build/gke-test-cluster/cluster.yml.jinja | 12 +++++++++--- site/content/en/docs/Installation/_index.md | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build/gke-test-cluster/cluster-e2e.yml b/build/gke-test-cluster/cluster-e2e.yml index afb5144bfb..2084ea813f 100644 --- a/build/gke-test-cluster/cluster-e2e.yml +++ b/build/gke-test-cluster/cluster-e2e.yml @@ -28,10 +28,12 @@ resources: tags: - game-server oauthScopes: - - https://www.googleapis.com/auth/compute - https://www.googleapis.com/auth/devstorage.read_only - https://www.googleapis.com/auth/logging.write - https://www.googleapis.com/auth/monitoring + - https://www.googleapis.com/auth/service.management.readonly + - https://www.googleapis.com/auth/servicecontrol + - https://www.googleapis.com/auth/trace.append - name: game-server-firewall type: compute.beta.firewall properties: diff --git a/build/gke-test-cluster/cluster.yml.jinja b/build/gke-test-cluster/cluster.yml.jinja index 96943a1adf..13bf29ed5f 100644 --- a/build/gke-test-cluster/cluster.yml.jinja +++ b/build/gke-test-cluster/cluster.yml.jinja @@ -30,19 +30,23 @@ resources: tags: - game-server oauthScopes: - - https://www.googleapis.com/auth/compute - https://www.googleapis.com/auth/devstorage.read_only - https://www.googleapis.com/auth/logging.write - https://www.googleapis.com/auth/monitoring + - https://www.googleapis.com/auth/service.management.readonly + - https://www.googleapis.com/auth/servicecontrol + - https://www.googleapis.com/auth/trace.append - name: "agones-system" initialNodeCount: 1 config: machineType: n1-standard-4 oauthScopes: - - https://www.googleapis.com/auth/compute - https://www.googleapis.com/auth/devstorage.read_only - https://www.googleapis.com/auth/logging.write - https://www.googleapis.com/auth/monitoring + - https://www.googleapis.com/auth/service.management.readonly + - https://www.googleapis.com/auth/servicecontrol + - https://www.googleapis.com/auth/trace.append labels: stable.agones.dev/agones-system: "true" taints: @@ -54,10 +58,12 @@ resources: config: machineType: n1-standard-4 oauthScopes: - - https://www.googleapis.com/auth/compute - https://www.googleapis.com/auth/devstorage.read_only - https://www.googleapis.com/auth/logging.write - https://www.googleapis.com/auth/monitoring + - https://www.googleapis.com/auth/service.management.readonly + - https://www.googleapis.com/auth/servicecontrol + - https://www.googleapis.com/auth/trace.append labels: stable.agones.dev/agones-metrics: "true" taints: diff --git a/site/content/en/docs/Installation/_index.md b/site/content/en/docs/Installation/_index.md index 3452f0dc06..6e60ecc420 100644 --- a/site/content/en/docs/Installation/_index.md +++ b/site/content/en/docs/Installation/_index.md @@ -80,7 +80,7 @@ gcloud container clusters create [CLUSTER_NAME] --cluster-version=1.11 \ --tags=game-server \ --enable-basic-auth \ --password=supersecretpassword \ - --scopes=https://www.googleapis.com/auth/devstorage.read_only,compute-rw,cloud-platform \ + --scopes=gke-default \ --num-nodes=3 \ --machine-type=n1-standard-1 ```