diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-09-07 09:06:02 +0300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-09-14 07:26:51 +0300 |
| commit | 577c79bb58ae80f4d7aef55e76bfeff67a1cfc45 (patch) | |
| tree | 76524765c74f5a4477b7ce5378e3ff9faf14f627 /app/services/clusters/gcp/finalize_creation_service.rb | |
| parent | c9af170d9aeeb39dbb41a99c00402beb384da0e9 (diff) | |
ABAC: fetch default service account token; RBAC: fetch gitlab service acount token
Keeps existing behaviour for ABAC cluster
Diffstat (limited to 'app/services/clusters/gcp/finalize_creation_service.rb')
| -rw-r--r-- | app/services/clusters/gcp/finalize_creation_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb index 91e49b8394a..40103d8e213 100644 --- a/app/services/clusters/gcp/finalize_creation_service.rb +++ b/app/services/clusters/gcp/finalize_creation_service.rb @@ -47,7 +47,9 @@ module Clusters end def request_kubernetes_token - Clusters::Gcp::Kubernetes::FetchKubernetesTokenService.new(kube_client).execute + service_account_name = rbac_clusters_feature_enabled? ? Clusters::Gcp::Kubernetes::SERVICE_ACCOUNT_NAME : 'default' + + Clusters::Gcp::Kubernetes::FetchKubernetesTokenService.new(kube_client, service_account_name).execute end def authorization_type |