Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

8 files changed, 22 insertions, 1 deletions

diff --git a/app/workers/namespaces/in_product_marketing_emails_worker.rb b/app/workers/namespaces/in_product_marketing_emails_worker.rb
index 3070afed3d6..7985325d1ad 100644
--- a/app/workers/namespaces/in_product_marketing_emails_worker.rb
+++ b/app/workers/namespaces/in_product_marketing_emails_worker.rb
@@ -3,9 +3,12 @@
 module Namespaces
   class InProductMarketingEmailsWorker # rubocop:disable Scalability/IdempotentWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
 
     feature_category :subgroups
+    tags :exclude_from_kubernetes
     urgency :low
 
     def perform
@@ -32,4 +35,4 @@ module Namespaces
   end
 end
 
-Namespaces::InProductMarketingEmailsWorker.prepend_if_ee('EE::Namespaces::InProductMarketingEmailsWorker')
+Namespaces::InProductMarketingEmailsWorker.prepend_mod_with('Namespaces::InProductMarketingEmailsWorker')
diff --git a/app/workers/namespaces/onboarding_issue_created_worker.rb b/app/workers/namespaces/onboarding_issue_created_worker.rb
index e5e2c80e821..7b8b1a43078 100644
--- a/app/workers/namespaces/onboarding_issue_created_worker.rb
+++ b/app/workers/namespaces/onboarding_issue_created_worker.rb
@@ -4,7 +4,10 @@ module Namespaces
   class OnboardingIssueCreatedWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 3
+
     feature_category :issue_tracking
+    tags :exclude_from_kubernetes
     urgency :low
 
     deduplicate :until_executing
diff --git a/app/workers/namespaces/onboarding_pipeline_created_worker.rb b/app/workers/namespaces/onboarding_pipeline_created_worker.rb
index e1de6d0046b..128d7b6aa06 100644
--- a/app/workers/namespaces/onboarding_pipeline_created_worker.rb
+++ b/app/workers/namespaces/onboarding_pipeline_created_worker.rb
@@ -4,7 +4,10 @@ module Namespaces
   class OnboardingPipelineCreatedWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 3
+
     feature_category :subgroups
+    tags :exclude_from_kubernetes
     urgency :low
 
     deduplicate :until_executing
diff --git a/app/workers/namespaces/onboarding_progress_worker.rb b/app/workers/namespaces/onboarding_progress_worker.rb
index 9cb5a23cf31..d4db55a9207 100644
--- a/app/workers/namespaces/onboarding_progress_worker.rb
+++ b/app/workers/namespaces/onboarding_progress_worker.rb
@@ -4,7 +4,10 @@ module Namespaces
   class OnboardingProgressWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 3
+
     feature_category :product_analytics
+    tags :exclude_from_kubernetes
     urgency :low
 
     deduplicate :until_executed
diff --git a/app/workers/namespaces/onboarding_user_added_worker.rb b/app/workers/namespaces/onboarding_user_added_worker.rb
index 02608268d6f..8c85dfafa12 100644
--- a/app/workers/namespaces/onboarding_user_added_worker.rb
+++ b/app/workers/namespaces/onboarding_user_added_worker.rb
@@ -4,7 +4,10 @@ module Namespaces
   class OnboardingUserAddedWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 3
+
     feature_category :users
+    tags :exclude_from_kubernetes
     urgency :low
 
     idempotent!
diff --git a/app/workers/namespaces/prune_aggregation_schedules_worker.rb b/app/workers/namespaces/prune_aggregation_schedules_worker.rb
index b94c8b7b4ba..0ea27c532ae 100644
--- a/app/workers/namespaces/prune_aggregation_schedules_worker.rb
+++ b/app/workers/namespaces/prune_aggregation_schedules_worker.rb
@@ -3,6 +3,8 @@
 module Namespaces
   class PruneAggregationSchedulesWorker # rubocop:disable Scalability/IdempotentWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
 
     feature_category :source_code_management
diff --git a/app/workers/namespaces/root_statistics_worker.rb b/app/workers/namespaces/root_statistics_worker.rb
index 5d4b510ceb7..92bf2e22020 100644
--- a/app/workers/namespaces/root_statistics_worker.rb
+++ b/app/workers/namespaces/root_statistics_worker.rb
@@ -4,6 +4,8 @@ module Namespaces
   class RootStatisticsWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 3
+
     queue_namespace :update_namespace_statistics
     feature_category :source_code_management
     idempotent!
diff --git a/app/workers/namespaces/schedule_aggregation_worker.rb b/app/workers/namespaces/schedule_aggregation_worker.rb
index cbf5ed44572..cee273688e9 100644
--- a/app/workers/namespaces/schedule_aggregation_worker.rb
+++ b/app/workers/namespaces/schedule_aggregation_worker.rb
@@ -4,6 +4,8 @@ module Namespaces
   class ScheduleAggregationWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 3
+
     queue_namespace :update_namespace_statistics
     feature_category :source_code_management
     idempotent!