Merge branch 'leaky-constant-fix-8' into 'master'

Fix leaky constant in upgrade progess service check

See merge request gitlab-org/gitlab!31969

.rubocop.yml

@@ -396,8 +396,6 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/services/ci/retry_build_service_spec.rb'
     - 'spec/services/clusters/applications/check_installation_progress_service_spec.rb'
     - 'spec/services/clusters/applications/check_uninstall_progress_service_spec.rb'
-    - 'spec/services/clusters/applications/check_upgrade_progress_service_spec.rb'
-    - 'spec/services/clusters/applications/ingress_modsecurity_usage_service_spec.rb'
     - 'spec/services/issues/resolve_discussions_spec.rb'
     - 'spec/support/shared_contexts/spam_constants.rb'
     - 'spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb'

changelogs/unreleased/leaky-constant-fix-8.yml

+---
+title: Fix leaky constant issue in upgrade progress service check
+merge_request: 31969
+author: Rajendra Kadam
+type: fixed

spec/services/clusters/applications/check_upgrade_progress_service_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Clusters::Applications::CheckUpgradeProgressService do
-  RESCHEDULE_PHASES = ::Gitlab::Kubernetes::Pod::PHASES -
+  reschedule_phashes = ::Gitlab::Kubernetes::Pod::PHASES -
     [::Gitlab::Kubernetes::Pod::SUCCEEDED, ::Gitlab::Kubernetes::Pod::FAILED, ::Gitlab].freeze
 
   let(:application) { create(:clusters_applications_prometheus, :updating) }
@@ -89,6 +89,6 @@ describe Clusters::Applications::CheckUpgradeProgressService do
       end
     end
 
-    RESCHEDULE_PHASES.each { |phase| it_behaves_like 'a not yet terminated upgrade', phase }
+    reschedule_phashes.each { |phase| it_behaves_like 'a not yet terminated upgrade', phase }
   end
 end