diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/google_api | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/google_api')
-rw-r--r-- | lib/google_api/cloud_platform/client.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index 34e3be2320b..c917debd3d9 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -13,10 +13,6 @@ module GoogleApi LEAST_TOKEN_LIFE_TIME = 10.minutes CLUSTER_MASTER_AUTH_USERNAME = 'admin' CLUSTER_IPV4_CIDR_BLOCK = '/16' - # Don't upgrade to > 1.18 before we move away from Basic Auth - # See issue: https://gitlab.com/gitlab-org/gitlab/-/issues/331582 - # Possible solution: https://gitlab.com/groups/gitlab-org/-/epics/6049 - GKE_VERSION = '1.18' CLUSTER_OAUTH_SCOPES = [ "https://www.googleapis.com/auth/devstorage.read_only", "https://www.googleapis.com/auth/logging.write", @@ -94,13 +90,11 @@ module GoogleApi cluster: { name: cluster_name, initial_node_count: cluster_size, - initial_cluster_version: GKE_VERSION, node_config: { machine_type: machine_type, oauth_scopes: CLUSTER_OAUTH_SCOPES }, master_auth: { - username: CLUSTER_MASTER_AUTH_USERNAME, client_certificate_config: { issue_client_certificate: true } |