Only create new service account with cluster-admin clusterrolebinding for when we have the rbac cluster FF enabled.

This syncs up with `authorization_type`.

1 files changed, 8 insertions, 2 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