Merge branch 'remove-worker-tags' into 'master'

Remove Sidekiq worker tags See merge request gitlab-org/gitlab!69209

Merge branch 'remove-worker-tags' into 'master'
Remove Sidekiq worker tags See merge request gitlab-org/gitlab!69209
cb77213e · Rémy Coutable · 69dac061 · a958ab44 · cb77213e · cb77213e
Commit cb77213e authored Aug 31, 2021 by Rémy Coutable
134 changed files
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
--- a/app/workers/analytics/usage_trends/count_job_trigger_worker.rb
+++ b/app/workers/analytics/usage_trends/count_job_trigger_worker.rb
@@ -13,7 +13,6 @@ module Analytics
      DEFAULT_DELAY = 3.minutes.freeze

      feature_category :devops_reports
-      tags :exclude_from_kubernetes
      urgency :low

      idempotent!

--- a/app/workers/analytics/usage_trends/counter_job_worker.rb
+++ b/app/workers/analytics/usage_trends/counter_job_worker.rb
@@ -12,7 +12,6 @@ module Analytics

      feature_category :devops_reports
      urgency :low
-      tags :exclude_from_kubernetes

      idempotent!


--- a/app/workers/approve_blocked_pending_approval_users_worker.rb
+++ b/app/workers/approve_blocked_pending_approval_users_worker.rb
@@ -10,7 +10,6 @@ class ApproveBlockedPendingApprovalUsersWorker
  idempotent!

  feature_category :users
-  tags :exclude_from_kubernetes

  def perform(current_user_id)
    current_user = User.find(current_user_id)

--- a/app/workers/bulk_import_worker.rb
+++ b/app/workers/bulk_import_worker.rb
@@ -6,7 +6,6 @@ class BulkImportWorker # rubocop:disable Scalability/IdempotentWorker
  data_consistency :always

  feature_category :importers
-  tags :exclude_from_kubernetes

  sidekiq_options retry: false, dead: false


--- a/app/workers/bulk_imports/entity_worker.rb
+++ b/app/workers/bulk_imports/entity_worker.rb
@@ -7,7 +7,6 @@ module BulkImports
    data_consistency :always

    feature_category :importers
-    tags :exclude_from_kubernetes

    sidekiq_options retry: false, dead: false


--- a/app/workers/bulk_imports/pipeline_worker.rb
+++ b/app/workers/bulk_imports/pipeline_worker.rb
@@ -9,7 +9,6 @@ module BulkImports
    NDJSON_PIPELINE_PERFORM_DELAY = 1.minute

    feature_category :importers
-    tags :exclude_from_kubernetes

    sidekiq_options retry: false, dead: false


--- a/app/workers/bulk_imports/relation_export_worker.rb
+++ b/app/workers/bulk_imports/relation_export_worker.rb
@@ -10,7 +10,6 @@ module BulkImports
    idempotent!
    loggable_arguments 2, 3
    feature_category :importers
-    tags :exclude_from_kubernetes
    sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION

    def perform(user_id, portable_id, portable_class, relation)

--- a/app/workers/ci/delete_objects_worker.rb
+++ b/app/workers/ci/delete_objects_worker.rb
@@ -10,7 +10,6 @@ module Ci
    include LimitedCapacity::Worker

    feature_category :continuous_integration
-    tags :exclude_from_kubernetes
    idempotent!

    def perform_work(*args)

--- a/app/workers/ci/drop_pipeline_worker.rb
+++ b/app/workers/ci/drop_pipeline_worker.rb
@@ -9,8 +9,6 @@ module Ci
    sidekiq_options retry: 3
    include PipelineQueue

-    tags :exclude_from_kubernetes
-
    idempotent!

    def perform(pipeline_id, failure_reason)

--- a/app/workers/ci/merge_requests/add_todo_when_build_fails_worker.rb
+++ b/app/workers/ci/merge_requests/add_todo_when_build_fails_worker.rb
@@ -10,7 +10,6 @@ module Ci
      include PipelineQueue

      urgency :low
-      tags :exclude_from_kubernetes
      idempotent!

      def perform(job_id)

--- a/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
@@ -11,7 +11,6 @@ module Ci

      queue_namespace :pipeline_background
      feature_category :code_testing
-      tags :exclude_from_kubernetes

      idempotent!


--- a/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
@@ -15,7 +15,6 @@ module Ci
      deduplicate :until_executed, including_scheduled: true
      idempotent!
      feature_category :continuous_integration
-      tags :exclude_from_kubernetes

      def perform
        service = ::Ci::PipelineArtifacts::DestroyAllExpiredService.new

--- a/app/workers/ci/schedule_delete_objects_cron_worker.rb
+++ b/app/workers/ci/schedule_delete_objects_cron_worker.rb
@@ -12,7 +12,6 @@ module Ci
    # rubocop:enable Scalability/CronWorkerContext

    feature_category :continuous_integration
-    tags :exclude_from_kubernetes
    idempotent!

    def perform(*args)

--- a/app/workers/ci/test_failure_history_worker.rb
+++ b/app/workers/ci/test_failure_history_worker.rb
@@ -9,8 +9,6 @@ module Ci
    sidekiq_options retry: 3
    include PipelineBackgroundQueue

-    tags :exclude_from_kubernetes
-
    idempotent!

    def perform(pipeline_id)

--- a/app/workers/concerns/chaos_queue.rb
+++ b/app/workers/concerns/chaos_queue.rb
@@ -6,6 +6,5 @@ module ChaosQueue
  included do
    queue_namespace :chaos
    feature_category_not_owned!
-    tags :exclude_from_gitlab_com
  end
 end
--- a/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
+++ b/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
@@ -12,7 +12,6 @@ module ContainerExpirationPolicies

    queue_namespace :container_repository
    feature_category :container_registry
-    tags :exclude_from_kubernetes
    urgency :low
    worker_resource_boundary :unknown
    idempotent!

--- a/app/workers/database/batched_background_migration_worker.rb
+++ b/app/workers/database/batched_background_migration_worker.rb
@@ -9,7 +9,6 @@ module Database
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :database
-    tags :exclude_from_kubernetes
    idempotent!

    LEASE_TIMEOUT_MULTIPLIER = 3

--- a/app/workers/deployments/drop_older_deployments_worker.rb
+++ b/app/workers/deployments/drop_older_deployments_worker.rb
@@ -10,7 +10,6 @@ module Deployments

    queue_namespace :deployment
    feature_category :continuous_delivery
-    tags :exclude_from_kubernetes

    def perform(deployment_id)
      Deployments::OlderDeploymentsDropService.new(deployment_id).execute

--- a/app/workers/design_management/copy_design_collection_worker.rb
+++ b/app/workers/design_management/copy_design_collection_worker.rb
@@ -9,7 +9,6 @@ module DesignManagement
    sidekiq_options retry: 3

    feature_category :design_management
-    tags :exclude_from_kubernetes
    idempotent!
    urgency :low


--- a/app/workers/destroy_pages_deployments_worker.rb
+++ b/app/workers/destroy_pages_deployments_worker.rb
@@ -10,7 +10,6 @@ class DestroyPagesDeploymentsWorker
  loggable_arguments 0, 1
  sidekiq_options retry: 3
  feature_category :pages
-  tags :exclude_from_kubernetes

  def perform(project_id, last_deployment_id = nil)
    project = Project.find_by_id(project_id)

--- a/app/workers/disallow_two_factor_for_group_worker.rb
+++ b/app/workers/disallow_two_factor_for_group_worker.rb
@@ -9,7 +9,6 @@ class DisallowTwoFactorForGroupWorker
  include ExceptionBacktrace

  feature_category :subgroups
-  tags :exclude_from_kubernetes
  idempotent!

  def perform(group_id)

--- a/app/workers/disallow_two_factor_for_subgroups_worker.rb
+++ b/app/workers/disallow_two_factor_for_subgroups_worker.rb
@@ -11,7 +11,6 @@ class DisallowTwoFactorForSubgroupsWorker
  INTERVAL = 2.seconds.to_i

  feature_category :subgroups
-  tags :exclude_from_kubernetes
  idempotent!

  def perform(group_id)

--- a/app/workers/environments/canary_ingress/update_worker.rb
+++ b/app/workers/environments/canary_ingress/update_worker.rb
@@ -11,7 +11,6 @@ module Environments
      idempotent!
      worker_has_external_dependencies!
      feature_category :continuous_delivery
-      tags :exclude_from_kubernetes

      def perform(environment_id, params)
        Environment.find_by_id(environment_id).try do |environment|

--- a/app/workers/experiments/record_conversion_event_worker.rb
+++ b/app/workers/experiments/record_conversion_event_worker.rb
@@ -9,7 +9,6 @@ module Experiments
    sidekiq_options retry: 3

    feature_category :users
-    tags :exclude_from_kubernetes
    urgency :low

    idempotent!

--- a/app/workers/flush_counter_increments_worker.rb
+++ b/app/workers/flush_counter_increments_worker.rb
@@ -13,7 +13,6 @@ class FlushCounterIncrementsWorker
  sidekiq_options retry: 3

  feature_category_not_owned!
-  tags :exclude_from_kubernetes
  urgency :low
  deduplicate :until_executing, including_scheduled: true


--- a/app/workers/gitlab/github_import/import_pull_request_merged_by_worker.rb
+++ b/app/workers/gitlab/github_import/import_pull_request_merged_by_worker.rb
@@ -5,7 +5,6 @@ module Gitlab
    class ImportPullRequestMergedByWorker # rubocop:disable Scalability/IdempotentWorker
      include ObjectImporter

-      tags :exclude_from_kubernetes
      worker_resource_boundary :cpu

      def representation_class

--- a/app/workers/gitlab/github_import/import_pull_request_review_worker.rb
+++ b/app/workers/gitlab/github_import/import_pull_request_review_worker.rb
@@ -5,7 +5,6 @@ module Gitlab
    class ImportPullRequestReviewWorker # rubocop:disable Scalability/IdempotentWorker
      include ObjectImporter

-      tags :exclude_from_kubernetes
      worker_resource_boundary :cpu

      def representation_class

--- a/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb
+++ b/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb
@@ -12,8 +12,6 @@ module Gitlab
        include GithubImport::Queue
        include StageMethods

-        tags :exclude_from_kubernetes
-
        # client - An instance of Gitlab::GithubImport::Client.
        # project - An instance of Project.
        def import(client, project)

--- a/app/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker.rb
+++ b/app/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker.rb
@@ -12,8 +12,6 @@ module Gitlab
        include GithubImport::Queue
        include StageMethods

-        tags :exclude_from_kubernetes
-
        # client - An instance of Gitlab::GithubImport::Client.
        # project - An instance of Project.
        def import(client, project)

--- a/app/workers/gitlab_performance_bar_stats_worker.rb
+++ b/app/workers/gitlab_performance_bar_stats_worker.rb
@@ -15,7 +15,6 @@ class GitlabPerformanceBarStatsWorker
  STATS_KEY_EXPIRE = 30.minutes.to_i

  feature_category :metrics
-  tags :exclude_from_kubernetes
  idempotent!

  def perform(lease_uuid)

--- a/app/workers/group_destroy_worker.rb
+++ b/app/workers/group_destroy_worker.rb
@@ -9,7 +9,6 @@ class GroupDestroyWorker # rubocop:disable Scalability/IdempotentWorker
  include ExceptionBacktrace

  feature_category :subgroups
-  tags :requires_disk_io, :exclude_from_kubernetes

  def perform(group_id, user_id)
    begin

--- a/app/workers/hashed_storage/migrator_worker.rb
+++ b/app/workers/hashed_storage/migrator_worker.rb
@@ -13,7 +13,7 @@ module HashedStorage

    # Gitlab::HashedStorage::Migrator#migration_pending? depends on the
    # queue size of this worker.
-    tags :exclude_from_gitlab_com, :needs_own_queue
+    tags :needs_own_queue

    # @param [Integer] start initial ID of the batch
    # @param [Integer] finish last ID of the batch

--- a/app/workers/hashed_storage/project_migrate_worker.rb
+++ b/app/workers/hashed_storage/project_migrate_worker.rb
@@ -13,7 +13,7 @@ module HashedStorage

    # Gitlab::HashedStorage::Migrator#migration_pending? depends on the
    # queue size of this worker.
-    tags :exclude_from_gitlab_com, :needs_own_queue
+    tags :needs_own_queue

    attr_reader :project_id


--- a/app/workers/hashed_storage/project_rollback_worker.rb
+++ b/app/workers/hashed_storage/project_rollback_worker.rb
@@ -13,7 +13,7 @@ module HashedStorage

    # Gitlab::HashedStorage::Migrator#rollback_pending? depends on the
    # queue size of this worker.
-    tags :exclude_from_gitlab_com, :needs_own_queue
+    tags :needs_own_queue

    attr_reader :project_id


--- a/app/workers/hashed_storage/rollbacker_worker.rb
+++ b/app/workers/hashed_storage/rollbacker_worker.rb
@@ -13,7 +13,7 @@ module HashedStorage

    # Gitlab::HashedStorage::Migrator#rollback_pending? depends on the
    # queue size of this worker.
-    tags :exclude_from_gitlab_com, :needs_own_queue
+    tags :needs_own_queue

    # @param [Integer] start initial ID of the batch
    # @param [Integer] finish last ID of the batch

--- a/app/workers/incident_management/add_severity_system_note_worker.rb
+++ b/app/workers/incident_management/add_severity_system_note_worker.rb
@@ -11,7 +11,6 @@ module IncidentManagement

    queue_namespace :incident_management
    feature_category :incident_management
-    tags :exclude_from_kubernetes

    def perform(incident_id, user_id)
      return if incident_id.blank? || user_id.blank?

--- a/app/workers/issue_rebalancing_worker.rb
+++ b/app/workers/issue_rebalancing_worker.rb
@@ -10,7 +10,6 @@ class IssueRebalancingWorker
  idempotent!
  urgency :low
  feature_category :issue_tracking
-  tags :exclude_from_kubernetes
  deduplicate :until_executed, including_scheduled: true

  def perform(ignore = nil, project_id = nil, root_namespace_id = nil)

--- a/app/workers/jira_connect/sync_builds_worker.rb
+++ b/app/workers/jira_connect/sync_builds_worker.rb
@@ -8,7 +8,6 @@ module JiraConnect
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
-    tags :exclude_from_kubernetes
    urgency :low

    worker_has_external_dependencies!

--- a/app/workers/jira_connect/sync_deployments_worker.rb
+++ b/app/workers/jira_connect/sync_deployments_worker.rb
@@ -8,7 +8,6 @@ module JiraConnect
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
-    tags :exclude_from_kubernetes
    urgency :low

    worker_has_external_dependencies!

--- a/app/workers/jira_connect/sync_feature_flags_worker.rb
+++ b/app/workers/jira_connect/sync_feature_flags_worker.rb
@@ -8,7 +8,6 @@ module JiraConnect
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
-    tags :exclude_from_kubernetes
    urgency :low

    worker_has_external_dependencies!

--- a/app/workers/jira_connect/sync_project_worker.rb
+++ b/app/workers/jira_connect/sync_project_worker.rb
@@ -8,7 +8,6 @@ module JiraConnect
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
-    tags :exclude_from_kubernetes
    urgency :low

    worker_has_external_dependencies!

--- a/app/workers/member_invitation_reminder_emails_worker.rb
+++ b/app/workers/member_invitation_reminder_emails_worker.rb
@@ -8,7 +8,6 @@ class MemberInvitationReminderEmailsWorker # rubocop:disable Scalability/Idempot
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :subgroups
-  tags :exclude_from_kubernetes
  urgency :low

  def perform

--- a/app/workers/merge_request_cleanup_refs_worker.rb
+++ b/app/workers/merge_request_cleanup_refs_worker.rb
@@ -10,7 +10,6 @@ class MergeRequestCleanupRefsWorker
  sidekiq_options retry: 3

  feature_category :code_review
-  tags :exclude_from_kubernetes
  idempotent!

  # Hard-coded to 4 for now. Will be configurable later on via application settings.

--- a/app/workers/metrics/dashboard/sync_dashboards_worker.rb
+++ b/app/workers/metrics/dashboard/sync_dashboards_worker.rb
@@ -10,7 +10,6 @@ module Metrics
      sidekiq_options retry: 3

      feature_category :metrics
-      tags :exclude_from_kubernetes

      idempotent!


--- a/app/workers/namespaces/in_product_marketing_emails_worker.rb
+++ b/app/workers/namespaces/in_product_marketing_emails_worker.rb
@@ -9,7 +9,6 @@ module Namespaces
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :subgroups
-    tags :exclude_from_kubernetes
    urgency :low

    def perform

--- a/app/workers/namespaces/onboarding_issue_created_worker.rb
+++ b/app/workers/namespaces/onboarding_issue_created_worker.rb
@@ -9,7 +9,6 @@ module Namespaces
    sidekiq_options retry: 3

    feature_category :issue_tracking
-    tags :exclude_from_kubernetes
    urgency :low

    deduplicate :until_executing

--- a/app/workers/namespaces/onboarding_pipeline_created_worker.rb
+++ b/app/workers/namespaces/onboarding_pipeline_created_worker.rb
@@ -9,7 +9,6 @@ module Namespaces
    sidekiq_options retry: 3

    feature_category :subgroups
-    tags :exclude_from_kubernetes
    urgency :low

    deduplicate :until_executing

--- a/app/workers/namespaces/onboarding_progress_worker.rb
+++ b/app/workers/namespaces/onboarding_progress_worker.rb
@@ -10,7 +10,6 @@ module Namespaces

    feature_category :product_analytics
    worker_resource_boundary :cpu
-    tags :exclude_from_kubernetes
    urgency :low

    deduplicate :until_executed

--- a/app/workers/namespaces/onboarding_user_added_worker.rb
+++ b/app/workers/namespaces/onboarding_user_added_worker.rb
@@ -9,7 +9,6 @@ module Namespaces
    sidekiq_options retry: 3

    feature_category :users
-    tags :exclude_from_kubernetes
    urgency :low

    idempotent!

--- a/app/workers/packages/composer/cache_cleanup_worker.rb
+++ b/app/workers/packages/composer/cache_cleanup_worker.rb
@@ -10,7 +10,6 @@ module Packages
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

      feature_category :package_registry
-      tags :exclude_from_kubernetes

      idempotent!


--- a/app/workers/packages/composer/cache_update_worker.rb
+++ b/app/workers/packages/composer/cache_update_worker.rb
@@ -10,7 +10,6 @@ module Packages
      sidekiq_options retry: 3

      feature_category :package_registry
-      tags :exclude_from_kubernetes

      idempotent!


--- a/app/workers/packages/debian/process_changes_worker.rb
+++ b/app/workers/packages/debian/process_changes_worker.rb
@@ -13,7 +13,6 @@ module Packages

      queue_namespace :package_repositories
      feature_category :package_registry
-      tags :exclude_from_kubernetes

      def perform(package_file_id, user_id)
        @package_file_id = package_file_id

--- a/app/workers/packages/go/sync_packages_worker.rb
+++ b/app/workers/packages/go/sync_packages_worker.rb
@@ -12,7 +12,6 @@ module Packages

      queue_namespace :package_repositories
      feature_category :package_registry
-      tags :exclude_from_kubernetes

      deduplicate :until_executing
      idempotent!

--- a/app/workers/packages/maven/metadata/sync_worker.rb
+++ b/app/workers/packages/maven/metadata/sync_worker.rb
@@ -13,7 +13,6 @@ module Packages

        queue_namespace :package_repositories
        feature_category :package_registry
-        tags :exclude_from_kubernetes

        deduplicate :until_executing
        idempotent!

--- a/app/workers/packages/rubygems/extraction_worker.rb
+++ b/app/workers/packages/rubygems/extraction_worker.rb
@@ -11,7 +11,6 @@ module Packages

      queue_namespace :package_repositories
      feature_category :package_registry
-      tags :exclude_from_kubernetes
      deduplicate :until_executing

      def perform(package_file_id)

--- a/app/workers/pages_domain_ssl_renewal_worker.rb
+++ b/app/workers/pages_domain_ssl_renewal_worker.rb
@@ -8,7 +8,6 @@ class PagesDomainSslRenewalWorker # rubocop:disable Scalability/IdempotentWorker
  sidekiq_options retry: 3

  feature_category :pages
-  tags :requires_disk_io, :exclude_from_kubernetes

  def perform(domain_id)
    domain = PagesDomain.find_by_id(domain_id)

--- a/app/workers/pages_domain_verification_worker.rb
+++ b/app/workers/pages_domain_verification_worker.rb
@@ -8,7 +8,6 @@ class PagesDomainVerificationWorker # rubocop:disable Scalability/IdempotentWork
  sidekiq_options retry: 3

  feature_category :pages
-  tags :requires_disk_io, :exclude_from_kubernetes

  # rubocop: disable CodeReuse/ActiveRecord
  def perform(domain_id)

--- a/app/workers/pages_remove_worker.rb
+++ b/app/workers/pages_remove_worker.rb
@@ -8,7 +8,6 @@ class PagesRemoveWorker # rubocop:disable Scalability/IdempotentWorker

  sidekiq_options retry: 3
  feature_category :pages
-  tags :exclude_from_kubernetes
  loggable_arguments 0

  def perform(project_id)

--- a/app/workers/pages_transfer_worker.rb
+++ b/app/workers/pages_transfer_worker.rb
@@ -10,7 +10,6 @@ class PagesTransferWorker # rubocop:disable Scalability/IdempotentWorker
  TransferFailedError = Class.new(StandardError)

  feature_category :pages
-  tags :exclude_from_kubernetes
  loggable_arguments 0, 1

  def perform(method, args)

--- a/app/workers/pages_update_configuration_worker.rb
+++ b/app/workers/pages_update_configuration_worker.rb
@@ -9,7 +9,6 @@ class PagesUpdateConfigurationWorker

  idempotent!
  feature_category :pages
-  tags :exclude_from_kubernetes

  def self.perform_async(*args)
    return unless ::Settings.pages.local_store.enabled

--- a/app/workers/pages_worker.rb
+++ b/app/workers/pages_worker.rb
@@ -8,7 +8,6 @@ class PagesWorker # rubocop:disable Scalability/IdempotentWorker
  sidekiq_options retry: 3
  feature_category :pages
  loggable_arguments 0, 1
-  tags :requires_disk_io, :exclude_from_kubernetes
  worker_resource_boundary :cpu

  def perform(action, *arg)

--- a/app/workers/personal_access_tokens/expired_notification_worker.rb
+++ b/app/workers/personal_access_tokens/expired_notification_worker.rb
@@ -9,7 +9,6 @@ module PersonalAccessTokens
    include CronjobQueue

    feature_category :authentication_and_authorization
-    tags :exclude_from_kubernetes

    def perform(*args)
      notification_service = NotificationService.new

--- a/app/workers/project_destroy_worker.rb
+++ b/app/workers/project_destroy_worker.rb
@@ -9,7 +9,6 @@ class ProjectDestroyWorker # rubocop:disable Scalability/IdempotentWorker
  include ExceptionBacktrace

  feature_category :source_code_management
-  tags :requires_disk_io, :exclude_from_kubernetes

  def perform(project_id, user_id, params)
    project = Project.find(project_id)

--- a/app/workers/projects/git_garbage_collect_worker.rb
+++ b/app/workers/projects/git_garbage_collect_worker.rb
@@ -5,8 +5,6 @@ module Projects
    extend ::Gitlab::Utils::Override
    include GitGarbageCollectMethods

-    tags :exclude_from_kubernetes
-
    private

    override :find_resource

--- a/app/workers/projects/post_creation_worker.rb
+++ b/app/workers/projects/post_creation_worker.rb
@@ -9,7 +9,6 @@ module Projects
    sidekiq_options retry: 3

    feature_category :source_code_management
-    tags :exclude_from_kubernetes
    idempotent!

    def perform(project_id)

--- a/app/workers/propagate_integration_group_worker.rb
+++ b/app/workers/propagate_integration_group_worker.rb
@@ -6,7 +6,6 @@ class PropagateIntegrationGroupWorker
  data_consistency :always
  sidekiq_options retry: 3
  feature_category :integrations
-  tags :exclude_from_kubernetes
  urgency :low

  idempotent!

--- a/app/workers/propagate_integration_inherit_descendant_worker.rb
+++ b/app/workers/propagate_integration_inherit_descendant_worker.rb
@@ -6,7 +6,6 @@ class PropagateIntegrationInheritDescendantWorker
  data_consistency :always
  sidekiq_options retry: 3
  feature_category :integrations
-  tags :exclude_from_kubernetes
  urgency :low

  idempotent!

--- a/app/workers/propagate_integration_inherit_worker.rb
+++ b/app/workers/propagate_integration_inherit_worker.rb
@@ -6,7 +6,6 @@ class PropagateIntegrationInheritWorker
  data_consistency :always
  sidekiq_options retry: 3
  feature_category :integrations
-  tags :exclude_from_kubernetes
  urgency :low

  idempotent!

--- a/app/workers/propagate_integration_project_worker.rb
+++ b/app/workers/propagate_integration_project_worker.rb
@@ -6,7 +6,6 @@ class PropagateIntegrationProjectWorker
  data_consistency :always
  sidekiq_options retry: 3
  feature_category :integrations
-  tags :exclude_from_kubernetes
  urgency :low

  idempotent!

--- a/app/workers/releases/create_evidence_worker.rb
+++ b/app/workers/releases/create_evidence_worker.rb
@@ -9,7 +9,6 @@ module Releases
    sidekiq_options retry: 3

    feature_category :release_evidence
-    tags :exclude_from_kubernetes

    # pipeline_id is optional for backward compatibility with existing jobs
    # caller should always try to provide the pipeline and pass nil only

--- a/app/workers/releases/manage_evidence_worker.rb
+++ b/app/workers/releases/manage_evidence_worker.rb
@@ -9,7 +9,6 @@ module Releases
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :release_evidence
-    tags :exclude_from_kubernetes

    def perform
      releases = Release.without_evidence.released_within_2hrs

--- a/app/workers/remove_unaccepted_member_invites_worker.rb
+++ b/app/workers/remove_unaccepted_member_invites_worker.rb
@@ -8,7 +8,6 @@ class RemoveUnacceptedMemberInvitesWorker # rubocop:disable Scalability/Idempote
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :authentication_and_authorization
-  tags :exclude_from_kubernetes
  urgency :low
  idempotent!


--- a/app/workers/schedule_merge_request_cleanup_refs_worker.rb
+++ b/app/workers/schedule_merge_request_cleanup_refs_worker.rb
@@ -8,7 +8,6 @@ class ScheduleMergeRequestCleanupRefsWorker
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :code_review
-  tags :exclude_from_kubernetes
  idempotent!

  def perform

--- a/app/workers/ssh_keys/expired_notification_worker.rb
+++ b/app/workers/ssh_keys/expired_notification_worker.rb
@@ -9,7 +9,6 @@ module SshKeys
    include CronjobQueue

    feature_category :compliance_management
-    tags :exclude_from_kubernetes
    idempotent!

    BATCH_SIZE = 500

--- a/app/workers/ssh_keys/expiring_soon_notification_worker.rb
+++ b/app/workers/ssh_keys/expiring_soon_notification_worker.rb
@@ -9,7 +9,6 @@ module SshKeys
    include CronjobQueue

    feature_category :compliance_management
-    tags :exclude_from_kubernetes
    idempotent!

    def perform

--- a/app/workers/todos_destroyer/destroyed_issuable_worker.rb
+++ b/app/workers/todos_destroyer/destroyed_issuable_worker.rb
@@ -9,8 +9,6 @@ module TodosDestroyer
    sidekiq_options retry: 3
    include TodosDestroyerQueue

-    tags :exclude_from_kubernetes
-
    idempotent!

    def perform(target_id, target_type)

--- a/app/workers/user_status_cleanup/batch_worker.rb
+++ b/app/workers/user_status_cleanup/batch_worker.rb
@@ -12,7 +12,6 @@ module UserStatusCleanup
    # rubocop:enable Scalability/CronWorkerContext

    feature_category :users
-    tags :exclude_from_kubernetes

    idempotent!


--- a/app/workers/users/deactivate_dormant_users_worker.rb
+++ b/app/workers/users/deactivate_dormant_users_worker.rb
@@ -9,7 +9,6 @@ module Users
    include CronjobQueue

    feature_category :utilization
-    tags :exclude_from_kubernetes

    NUMBER_OF_BATCHES = 50
    BATCH_SIZE = 200

--- a/app/workers/web_hooks/destroy_worker.rb
+++ b/app/workers/web_hooks/destroy_worker.rb
@@ -7,7 +7,6 @@ module WebHooks
    data_consistency :always
    sidekiq_options retry: 3
    feature_category :integrations
-    tags :exclude_from_kubernetes
    urgency :low

    idempotent!

--- a/app/workers/wikis/git_garbage_collect_worker.rb
+++ b/app/workers/wikis/git_garbage_collect_worker.rb
@@ -5,8 +5,6 @@ module Wikis
    extend ::Gitlab::Utils::Override
    include GitGarbageCollectMethods

-    tags :exclude_from_kubernetes
-
    private

    override :find_resource

--- a/ee/app/workers/active_user_count_threshold_worker.rb
+++ b/ee/app/workers/active_user_count_threshold_worker.rb
@@ -11,7 +11,6 @@ class ActiveUserCountThresholdWorker # rubocop:disable Scalability/IdempotentWor
  # rubocop:enable Scalability/CronWorkerContext

  feature_category :license
-  tags :exclude_from_kubernetes

  def perform
    License.with_valid_license do |license|

--- a/ee/app/workers/all_queues.yml
+++ b/ee/app/workers/all_queues.yml
--- a/ee/app/workers/analytics/devops_adoption/create_all_snapshots_worker.rb
+++ b/ee/app/workers/analytics/devops_adoption/create_all_snapshots_worker.rb
@@ -12,7 +12,6 @@ module Analytics
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

      feature_category :devops_reports
-      tags :exclude_from_kubernetes
      idempotent!

      WORKERS_GAP = 5.seconds

--- a/ee/app/workers/analytics/devops_adoption/create_snapshot_worker.rb
+++ b/ee/app/workers/analytics/devops_adoption/create_snapshot_worker.rb
@@ -12,7 +12,6 @@ module Analytics

      feature_category :devops_reports
      idempotent!
-      tags :exclude_from_kubernetes

      def perform(enabled_namespace_id)
        enabled_namespace = EnabledNamespace.find(enabled_namespace_id)

--- a/ee/app/workers/approval_rules/external_approval_rule_payload_worker.rb
+++ b/ee/app/workers/approval_rules/external_approval_rule_payload_worker.rb
@@ -10,7 +10,6 @@ module ApprovalRules
    idempotent!

    feature_category :source_code_management
-    tags :exclude_from_kubernetes

    def perform(rule_id, data)
      rule = MergeRequests::ExternalStatusCheck.find(rule_id)

--- a/ee/app/workers/concerns/geo_queue.rb
+++ b/ee/app/workers/concerns/geo_queue.rb
@@ -7,6 +7,5 @@ module GeoQueue
  included do
    queue_namespace :geo
    feature_category :geo_replication
-    tags :exclude_from_gitlab_com
  end
 end
--- a/ee/app/workers/dast_site_validation_worker.rb
+++ b/ee/app/workers/dast_site_validation_worker.rb
@@ -12,7 +12,6 @@ class DastSiteValidationWorker
  sidekiq_retry_in { 25 }

  feature_category :dynamic_application_security_testing
-  tags :exclude_from_kubernetes

  def perform(_dast_site_validation_id)
    # Scheduled for removal in %15.0

--- a/ee/app/workers/deployments/auto_rollback_worker.rb
+++ b/ee/app/workers/deployments/auto_rollback_worker.rb
@@ -10,7 +10,6 @@ module Deployments

    idempotent!
    feature_category :continuous_delivery
-    tags :exclude_from_kubernetes
    queue_namespace :deployment

    def perform(environment_id)

--- a/ee/app/workers/dora/daily_metrics/refresh_worker.rb
+++ b/ee/app/workers/dora/daily_metrics/refresh_worker.rb
@@ -13,7 +13,6 @@ module Dora
      idempotent!
      queue_namespace :dora_metrics
      feature_category :continuous_delivery
-      tags :exclude_from_kubernetes

      def perform(environment_id, date)
        Environment.find_by_id(environment_id).try do |environment|

--- a/ee/app/workers/elastic_association_indexer_worker.rb
+++ b/ee/app/workers/elastic_association_indexer_worker.rb
@@ -9,7 +9,6 @@ class ElasticAssociationIndexerWorker # rubocop:disable Scalability/IdempotentWo

  feature_category :global_search
  worker_resource_boundary :cpu
-  tags :exclude_from_kubernetes
  loggable_arguments 0, 2

  def perform(class_name, id, indexed_associations)

--- a/ee/app/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker.rb
+++ b/ee/app/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker.rb
@@ -9,7 +9,6 @@ class ElasticRemoveExpiredNamespaceSubscriptionsFromIndexCronWorker
  include CronjobQueue

  feature_category :global_search
-  tags :exclude_from_kubernetes
  idempotent!

  def perform

--- a/ee/app/workers/geo/container_repository_sync_dispatch_worker.rb
+++ b/ee/app/workers/geo/container_repository_sync_dispatch_worker.rb
@@ -7,8 +7,6 @@ module Geo
    include CronjobQueue
    # rubocop:enable Scalability/CronWorkerContext

-    tags :exclude_from_gitlab_com
-
    def perform
      unless ::Geo::ContainerRepositoryRegistry.replication_enabled?
        log_info('Container Registry replication is not enabled')

--- a/ee/app/workers/geo/design_repository_shard_sync_worker.rb
+++ b/ee/app/workers/geo/design_repository_shard_sync_worker.rb
@@ -2,8 +2,6 @@

 module Geo
  class DesignRepositoryShardSyncWorker < RepositoryShardSyncWorker # rubocop:disable Scalability/IdempotentWorker
-    tags :exclude_from_gitlab_com
-
    private

    def schedule_job(project_id)

--- a/ee/app/workers/geo/destroy_worker.rb
+++ b/ee/app/workers/geo/destroy_worker.rb
@@ -12,7 +12,6 @@ module Geo

    idempotent!

-    tags :exclude_from_kubernetes, :exclude_from_gitlab_com
    loggable_arguments 0

    def perform(replicable_name, replicable_id)

--- a/ee/app/workers/geo/file_download_dispatch_worker.rb
+++ b/ee/app/workers/geo/file_download_dispatch_worker.rb
@@ -7,8 +7,6 @@ module Geo
    include CronjobQueue
    # rubocop:enable Scalability/CronWorkerContext

-    tags :exclude_from_gitlab_com
-
    private

    # Cannot utilise backoff because there are no events currently being

--- a/ee/app/workers/geo/metrics_update_worker.rb
+++ b/ee/app/workers/geo/metrics_update_worker.rb
@@ -13,7 +13,6 @@ module Geo
    # rubocop:enable Scalability/CronWorkerContext

    feature_category :geo_replication
-    tags :exclude_from_gitlab_com

    LEASE_TIMEOUT = 5.minutes


--- a/ee/app/workers/geo/prune_event_log_worker.rb
+++ b/ee/app/workers/geo/prune_event_log_worker.rb
@@ -13,7 +13,6 @@ module Geo
    include ::Gitlab::Geo::LogHelpers

    feature_category :geo_replication
-    tags :exclude_from_gitlab_com

    def perform
      return if Gitlab::Database.read_only?

--- a/ee/app/workers/geo/repository_shard_sync_worker.rb
+++ b/ee/app/workers/geo/repository_shard_sync_worker.rb
@@ -4,7 +4,6 @@ module Geo
  class RepositoryShardSyncWorker < Geo::Scheduler::Secondary::SchedulerWorker # rubocop:disable Scalability/IdempotentWorker
    sidekiq_options retry: false
    loggable_arguments 0
-    tags :exclude_from_gitlab_com

    attr_accessor :shard_name


--- a/ee/app/workers/geo/repository_sync_worker.rb
+++ b/ee/app/workers/geo/repository_sync_worker.rb
@@ -2,8 +2,6 @@

 module Geo
  class RepositorySyncWorker < Geo::Scheduler::Secondary::PerShardSchedulerWorker # rubocop:disable Scalability/IdempotentWorker
-    tags :exclude_from_gitlab_com
-
    def schedule_job(shard_name)
      Geo::RepositoryShardSyncWorker.perform_async(shard_name)
      Geo::DesignRepositoryShardSyncWorker.perform_async(shard_name)

--- a/ee/app/workers/geo/repository_verification/primary/batch_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/batch_worker.rb
--- a/ee/app/workers/geo/repository_verification/primary/shard_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/shard_worker.rb
--- a/ee/app/workers/geo/repository_verification/primary/single_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/single_worker.rb
--- a/ee/app/workers/geo/repository_verification/secondary/scheduler_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/scheduler_worker.rb
--- a/ee/app/workers/geo/repository_verification/secondary/shard_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/shard_worker.rb
--- a/ee/app/workers/geo/repository_verification/secondary/single_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/single_worker.rb
--- a/ee/app/workers/geo/reverification_batch_worker.rb
+++ b/ee/app/workers/geo/reverification_batch_worker.rb
--- a/ee/app/workers/geo/scheduler/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/per_shard_scheduler_worker.rb
--- a/ee/app/workers/geo/scheduler/primary/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/primary/per_shard_scheduler_worker.rb
--- a/ee/app/workers/geo/scheduler/primary/scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/primary/scheduler_worker.rb
--- a/ee/app/workers/geo/scheduler/secondary/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/secondary/per_shard_scheduler_worker.rb
--- a/ee/app/workers/geo/scheduler/secondary/scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/secondary/scheduler_worker.rb
--- a/ee/app/workers/geo/secondary/registry_consistency_worker.rb
+++ b/ee/app/workers/geo/secondary/registry_consistency_worker.rb
--- a/ee/app/workers/geo/secondary_usage_data_cron_worker.rb
+++ b/ee/app/workers/geo/secondary_usage_data_cron_worker.rb
--- a/ee/app/workers/geo/sync_timeout_cron_worker.rb
+++ b/ee/app/workers/geo/sync_timeout_cron_worker.rb
--- a/ee/app/workers/geo/verification_batch_worker.rb
+++ b/ee/app/workers/geo/verification_batch_worker.rb
--- a/ee/app/workers/geo/verification_cron_worker.rb
+++ b/ee/app/workers/geo/verification_cron_worker.rb
--- a/ee/app/workers/geo/verification_timeout_worker.rb
+++ b/ee/app/workers/geo/verification_timeout_worker.rb
--- a/ee/app/workers/geo/verification_worker.rb
+++ b/ee/app/workers/geo/verification_worker.rb
--- a/ee/app/workers/group_saml_group_sync_worker.rb
+++ b/ee/app/workers/group_saml_group_sync_worker.rb
--- a/ee/app/workers/group_wikis/git_garbage_collect_worker.rb
+++ b/ee/app/workers/group_wikis/git_garbage_collect_worker.rb
--- a/ee/app/workers/groups/update_statistics_worker.rb
+++ b/ee/app/workers/groups/update_statistics_worker.rb
--- a/ee/app/workers/incident_management/apply_incident_sla_exceeded_label_worker.rb
+++ b/ee/app/workers/incident_management/apply_incident_sla_exceeded_label_worker.rb
--- a/ee/app/workers/incident_management/incident_sla_exceeded_check_worker.rb
+++ b/ee/app/workers/incident_management/incident_sla_exceeded_check_worker.rb
--- a/ee/app/workers/incident_management/oncall_rotations/persist_all_rotations_shifts_job.rb
+++ b/ee/app/workers/incident_management/oncall_rotations/persist_all_rotations_shifts_job.rb
--- a/ee/app/workers/incident_management/oncall_rotations/persist_shifts_job.rb
+++ b/ee/app/workers/incident_management/oncall_rotations/persist_shifts_job.rb
--- a/ee/app/workers/ldap_group_sync_worker.rb
+++ b/ee/app/workers/ldap_group_sync_worker.rb
--- a/ee/app/workers/project_template_export_worker.rb
+++ b/ee/app/workers/project_template_export_worker.rb
--- a/ee/app/workers/requirements_management/import_requirements_csv_worker.rb
+++ b/ee/app/workers/requirements_management/import_requirements_csv_worker.rb
--- a/ee/app/workers/security/auto_fix_worker.rb
+++ b/ee/app/workers/security/auto_fix_worker.rb
--- a/ee/app/workers/security/store_scans_worker.rb
+++ b/ee/app/workers/security/store_scans_worker.rb
--- a/ee/app/workers/set_user_status_based_on_user_cap_setting_worker.rb
+++ b/ee/app/workers/set_user_status_based_on_user_cap_setting_worker.rb
--- a/ee/app/workers/todos_destroyer/confidential_epic_worker.rb
+++ b/ee/app/workers/todos_destroyer/confidential_epic_worker.rb
--- a/ee/app/workers/vulnerabilities/historical_statistics/deletion_worker.rb
+++ b/ee/app/workers/vulnerabilities/historical_statistics/deletion_worker.rb