Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-11-27 16:14:51 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-11-27 16:14:51 +0300
commitfcca3f64527515da2d96e7be3eae133ebbd1bc2d (patch)
treedaf18d71269b13599bcb308d7d599edc0c89cac4 /app/services/clusters
parent913740de00c6a768c145608fd821911ceb370326 (diff)
parent6a66e4a1f116ff98d8f9b8dffa3beed62d74e0b3 (diff)
Merge branch '51792-dont-delete-failed-install-pods' into 'master'
Don't remove failed install pods Closes #51792 See merge request gitlab-org/gitlab-ce!23350
Diffstat (limited to 'app/services/clusters')
-rw-r--r--app/services/clusters/applications/check_installation_progress_service.rb11
1 files changed, 2 insertions, 9 deletions
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index ca0f7b30053..6794580e1e8 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -29,17 +29,13 @@ module Clusters
end
def on_failed
- app.make_errored!('Installation failed')
- ensure
- remove_installation_pod
+ app.make_errored!("Installation failed. Check pod logs for #{install_command.pod_name} for more details.")
end
def check_timeout
if timeouted?
begin
- app.make_errored!('Installation timed out')
- ensure
- remove_installation_pod
+ app.make_errored!("Installation timed out. Check pod logs for #{install_command.pod_name} for more details.")
end
else
ClusterWaitForAppInstallationWorker.perform_in(
@@ -53,9 +49,6 @@ module Clusters
def remove_installation_pod
helm_api.delete_pod!(install_command.pod_name)
- rescue => e
- Rails.logger.error("Kubernetes error: #{e.class.name} #{e.message}")
- # no-op
end
def installation_phase