diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-30 18:14:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-30 18:14:17 +0300 |
| commit | 3fe9588b1c1c4fb58f8ba8e9c27244fc2fc1c103 (patch) | |
| tree | d19448d010ff9d58fed14846736ee358fb6b3327 /app/workers/clusters | |
| parent | ad8eea383406037a207c80421e6e4bfa357f8044 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/clusters')
| -rw-r--r-- | app/workers/clusters/applications/uninstall_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/clusters/applications/wait_for_uninstall_app_worker.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/workers/clusters/applications/uninstall_worker.rb b/app/workers/clusters/applications/uninstall_worker.rb index 85e8ecc4ad5..6180998c8d9 100644 --- a/app/workers/clusters/applications/uninstall_worker.rb +++ b/app/workers/clusters/applications/uninstall_worker.rb @@ -7,6 +7,8 @@ module Clusters include ClusterQueue include ClusterApplications + worker_has_external_dependencies! + def perform(app_name, app_id) find_application(app_name, app_id) do |app| Clusters::Applications::UninstallService.new(app).execute diff --git a/app/workers/clusters/applications/wait_for_uninstall_app_worker.rb b/app/workers/clusters/applications/wait_for_uninstall_app_worker.rb index 163c99d3c3c..7907aa8dfff 100644 --- a/app/workers/clusters/applications/wait_for_uninstall_app_worker.rb +++ b/app/workers/clusters/applications/wait_for_uninstall_app_worker.rb @@ -10,6 +10,9 @@ module Clusters INTERVAL = 10.seconds TIMEOUT = 20.minutes + worker_has_external_dependencies! + worker_resource_boundary :cpu + def perform(app_name, app_id) find_application(app_name, app_id) do |app| Clusters::Applications::CheckUninstallProgressService.new(app).execute |