summaryrefslogtreecommitdiff
path: root/spec/lib/google_api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-29 18:06:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-29 18:06:15 +0000
commitcb3e6b9c1b020378b5f94b4c38319a2dc961de01 (patch)
tree7933db817fb945478151685a393420b44fa52f7c /spec/lib/google_api
parentdee9315801b5dc49b795d13081086c22622a11ec (diff)
downloadgitlab-ce-cb3e6b9c1b020378b5f94b4c38319a2dc961de01.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/google_api')
-rw-r--r--spec/lib/google_api/cloud_platform/client_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/google_api/cloud_platform/client_spec.rb b/spec/lib/google_api/cloud_platform/client_spec.rb
index 0f7f57095df..473ad639ead 100644
--- a/spec/lib/google_api/cloud_platform/client_spec.rb
+++ b/spec/lib/google_api/cloud_platform/client_spec.rb
@@ -104,7 +104,8 @@ describe GoogleApi::CloudPlatform::Client do
enabled: legacy_abac
},
ip_allocation_policy: {
- use_ip_aliases: true
+ use_ip_aliases: true,
+ cluster_ipv4_cidr_block: '/16'
},
addons_config: addons_config
}