From 5a8431feceba47fd8e1804d9aa1b1730606b71d5 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 19 Nov 2019 22:11:55 +0000
Subject: Add latest changes from gitlab-org/gitlab@12-5-stable-ee

---
 lib/google_api/cloud_platform/client.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/google_api/cloud_platform')

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 }
-- 
cgit v1.2.1