diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-02-23 10:48:03 +1100 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-02-23 10:48:03 +1100 |
| commit | 103c69a988bf5ad7ab3b0e70bc88edd1dd723e79 (patch) | |
| tree | 92498c5376f46d91afafc910935b8ddfbcaf5bef /app/services | |
| parent | 69adf79234b586867eab8d0d130aff0083b7ef93 (diff) | |
| parent | 7834f63c07dd52965e3aa30262d2b8f130c955aa (diff) | |
| download | gitlab-ce-103c69a988bf5ad7ab3b0e70bc88edd1dd723e79.tar.gz | |
Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gke
Diffstat (limited to 'app/services')
| -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), |