diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-29 18:06:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-29 18:06:15 +0000 |
| commit | cb3e6b9c1b020378b5f94b4c38319a2dc961de01 (patch) | |
| tree | 7933db817fb945478151685a393420b44fa52f7c /lib/google_api | |
| parent | dee9315801b5dc49b795d13081086c22622a11ec (diff) | |
| download | gitlab-ce-cb3e6b9c1b020378b5f94b4c38319a2dc961de01.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/google_api')
| -rw-r--r-- | lib/google_api/cloud_platform/client.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index 9085835dee6..99029b54a69 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -12,6 +12,7 @@ module GoogleApi SCOPE = 'https://www.googleapis.com/auth/cloud-platform' LEAST_TOKEN_LIFE_TIME = 10.minutes CLUSTER_MASTER_AUTH_USERNAME = 'admin' + CLUSTER_IPV4_CIDR_BLOCK = '/16' class << self def session_key_for_token @@ -97,7 +98,8 @@ module GoogleApi enabled: legacy_abac }, ip_allocation_policy: { - use_ip_aliases: true + use_ip_aliases: true, + cluster_ipv4_cidr_block: CLUSTER_IPV4_CIDR_BLOCK }, addons_config: enable_addons.each_with_object({}) do |addon, hash| hash[addon] = { disabled: false } |