diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-02-22 15:13:30 -0600 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-02-22 15:27:56 -0600 |
| commit | 14978ddc53d3ae80a87198d543dbdd14674390dd (patch) | |
| tree | 294008baa8589d5c49b6a5bb53f5b42b6a535415 /app/services/clusters | |
| parent | f330f6596094751ec03dbde4eb8389d0281acaae (diff) | |
| download | gitlab-ce-14978ddc53d3ae80a87198d543dbdd14674390dd.tar.gz | |
Modify cluster creation API method to enable legacy_apac as default
GKE 1.8 has RBAC on by default, since GKE has bumped the default version
to 1.8.7 RBAC is now on, and we don't support that out of the box.
This was also avoiding cluster applications (tiller, prometheus, etc), to
be installed.
Closes #41619
Diffstat (limited to 'app/services/clusters')
| -rw-r--r-- | app/services/clusters/gcp/finalize_creation_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb index cea56f4e849..15ab2d54404 100644 --- a/app/services/clusters/gcp/finalize_creation_service.rb +++ b/app/services/clusters/gcp/finalize_creation_service.rb @@ -30,10 +30,10 @@ module Clusters ca_cert: Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate), username: gke_cluster.master_auth.username, password: gke_cluster.master_auth.password, - token: request_kuberenetes_token) + token: request_kubernetes_token) end - def request_kuberenetes_token + def request_kubernetes_token Ci::FetchKubernetesTokenService.new( 'https://' + gke_cluster.endpoint, Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate), |