Merge branch 'fix_multiple_instance_clusters' into 'master'

Add missing EE prepend for clusterable actions

Closes gitlab-ce#63366

See merge request gitlab-org/gitlab-ee!14270

app/policies/concerns/clusterable_actions.rb

@@ -12,3 +12,5 @@ module ClusterableActions
     !subject.clusters.empty?
   end
 end
+
+ClusterableActions.prepend(EE::ClusterableActions)

ee/app/policies/ee/group_policy.rb

@@ -124,5 +124,3 @@ module EE
     end
   end
 end
-
-EE::GroupPolicy.include(EE::ClusterableActions)

ee/app/policies/ee/project_policy.rb

@@ -264,5 +264,3 @@ module EE
     end
   end
 end
-
-EE::ProjectPolicy.include(EE::ClusterableActions)

ee/changelogs/unreleased/fix_multiple_instance_clusters.yml

+---
+title: Fix to allow adding multiple instance-level clusters
+merge_request: 14270
+author:
+type: fixed

ee/spec/policies/clusters/instance_policy_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Clusters::InstancePolicy do
+  let(:user) { create(:admin) }
+  let(:policy) { described_class.new(user, Clusters::Instance.new) }
+
+  describe 'rules' do
+    context 'multiple clusters allowed' do
+      before do
+        stub_feature_flags(multiple_clusters: true)
+      end
+
+      context 'no existing instance level cluster' do
+        it { expect(policy).to be_allowed :add_cluster }
+      end
+
+      context 'with an existing instance level cluster' do
+        before do
+          create(:cluster, :instance)
+        end
+
+        it { expect(policy).to be_allowed :add_cluster }
+      end
+    end
+
+    context 'multiple clusters disallowed' do
+      before do
+        stub_feature_flags(multiple_clusters: false)
+      end
+
+      context 'no existing instance level cluster' do
+        it { expect(policy).to be_allowed :add_cluster }
+      end
+
+      context 'with an existing instance level cluster' do
+        before do
+          create(:cluster, :instance)
+        end
+
+        it { expect(policy).to be_disallowed :add_cluster }
+      end
+    end
+  end
+end