diff options
| -rw-r--r-- | app/services/clusters/gcp/finalize_creation_service.rb | 10 | ||||
| -rw-r--r-- | spec/services/clusters/gcp/finalize_creation_service_spec.rb | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb index e5bc80f6697..91e49b8394a 100644 --- a/app/services/clusters/gcp/finalize_creation_service.rb +++ b/app/services/clusters/gcp/finalize_creation_service.rb @@ -25,7 +25,9 @@ module Clusters private def create_gitlab_service_account! - Clusters::Gcp::Kubernetes::CreateServiceAccountService.new(kube_client).execute + if rbac_clusters_feature_enabled? + Clusters::Gcp::Kubernetes::CreateServiceAccountService.new(kube_client).execute + end end def configure_provider @@ -49,7 +51,11 @@ module Clusters end def authorization_type - Feature.enabled?(:rbac_clusters) ? 'rbac' : 'abac' + rbac_clusters_feature_enabled? ? 'rbac' : 'abac' + end + + def rbac_clusters_feature_enabled? + Feature.enabled?(:rbac_clusters) end def kube_client diff --git a/spec/services/clusters/gcp/finalize_creation_service_spec.rb b/spec/services/clusters/gcp/finalize_creation_service_spec.rb index 9283df0b492..eede10b55c6 100644 --- a/spec/services/clusters/gcp/finalize_creation_service_spec.rb +++ b/spec/services/clusters/gcp/finalize_creation_service_spec.rb @@ -28,6 +28,10 @@ describe Clusters::Gcp::FinalizeCreationService do end end + before do + stub_feature_flags(rbac_clusters: false) + end + context 'when suceeded to fetch gke cluster info' do let(:endpoint) { '111.111.111.111' } let(:api_url) { 'https://' + endpoint } @@ -45,8 +49,6 @@ describe Clusters::Gcp::FinalizeCreationService do ) stub_kubeclient_discover(api_url) - stub_kubeclient_create_service_account(api_url) - stub_kubeclient_create_cluster_role_binding(api_url) end context 'when suceeded to fetch kuberenetes token' do @@ -59,8 +61,6 @@ describe Clusters::Gcp::FinalizeCreationService do metadata_name: 'gitlab-token-Y1a', token: Base64.encode64(token) } ) - - stub_feature_flags(rbac_clusters: false) end it_behaves_like 'success' @@ -83,6 +83,8 @@ describe Clusters::Gcp::FinalizeCreationService do context 'rbac_clusters feature enabled' do before do stub_feature_flags(rbac_clusters: true) + stub_kubeclient_create_service_account(api_url) + stub_kubeclient_create_cluster_role_binding(api_url) end it_behaves_like 'success' |