diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-08-29 23:38:26 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-09-14 16:26:50 +1200 |
| commit | bf0179b7f170d06d88a8bbe1fbf37e4c8abe6aad (patch) | |
| tree | fb17b4c714fdc5d581ff467eb5595119c57e5d25 /app | |
| parent | 0f210a69be773bcc9ce99d8e4bcbd0f695b0b280 (diff) | |
| download | gitlab-ce-bf0179b7f170d06d88a8bbe1fbf37e4c8abe6aad.tar.gz | |
Set RBAC support behind a feature flag.
This is the same as with adding an existing cluster
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/clusters/gcp/finalize_creation_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb index e0e8a9a372a..e5bc80f6697 100644 --- a/app/services/clusters/gcp/finalize_creation_service.rb +++ b/app/services/clusters/gcp/finalize_creation_service.rb @@ -48,9 +48,8 @@ module Clusters Clusters::Gcp::Kubernetes::FetchKubernetesTokenService.new(kube_client).execute end - # GKE Clusters have RBAC enabled on Kubernetes >= 1.6 def authorization_type - 'rbac' + Feature.enabled?(:rbac_clusters) ? 'rbac' : 'abac' end def kube_client |