Introduce manage_cluster queue for sidekiq workers

3 files changed, 12 insertions, 2 deletions

diff --git a/app/workers/cluster_creation_worker.rb b/app/workers/cluster_creation_worker.rb
index 220519134b9..d4ca9029a91 100644
--- a/app/workers/cluster_creation_worker.rb
+++ b/app/workers/cluster_creation_worker.rb
@@ -1,6 +1,6 @@
 class ClusterCreationWorker
   include Sidekiq::Worker
-  include DedicatedSidekiqQueue
+  include ClusterQueue
 
   def perform(cluster_id)
     Gcp::Cluster.find_by_id(cluster_id).try do |cluster|
diff --git a/app/workers/concerns/cluster_queue.rb b/app/workers/concerns/cluster_queue.rb
new file mode 100644
index 00000000000..736ae90303c
--- /dev/null
+++ b/app/workers/concerns/cluster_queue.rb
@@ -0,0 +1,10 @@
+##
+# Concern for setting Sidekiq settings for the various Gcp clusters workers.
+#
+module ClusterQueue
+  extend ActiveSupport::Concern
+
+  included do
+    sidekiq_options queue: :manage_cluster
+  end
+end
diff --git a/app/workers/wait_for_cluster_creation_worker.rb b/app/workers/wait_for_cluster_creation_worker.rb
index d1f9b4e07f4..3b9978e986a 100644
--- a/app/workers/wait_for_cluster_creation_worker.rb
+++ b/app/workers/wait_for_cluster_creation_worker.rb
@@ -1,6 +1,6 @@
 class WaitForClusterCreationWorker
   include Sidekiq::Worker
-  include DedicatedSidekiqQueue
+  include ClusterQueue
 
   INITIAL_INTERVAL = 2.minutes
   EAGER_INTERVAL = 10.seconds