summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2018-09-17 11:40:20 -0500
committerMayra Cabrera <mcabrera@gitlab.com>2018-09-17 12:35:42 -0500
commit6f0b7a39eba2b7b127060c80aeac28ebed1ad6a1 (patch)
tree334b493d0002d2057d5357c1b9e15455b26e3d7e /app/services
parentbff85a4b1c0c2b8e5dca1dc75bf9d1e902312bcf (diff)
downloadgitlab-ce-6f0b7a39eba2b7b127060c80aeac28ebed1ad6a1.tar.gz
Do not persist errors from Kubernetes calls
Diffstat (limited to 'app/services')
-rw-r--r--app/services/clusters/applications/check_installation_progress_service.rb6
-rw-r--r--app/services/clusters/applications/install_service.rb8
2 files changed, 7 insertions, 7 deletions
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index 35f5cff0e0c..5017fa093f3 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -14,8 +14,8 @@ module Clusters
else
check_timeout
end
- rescue Kubeclient::HttpError => ke
- app.make_errored!("Kubernetes error: #{ke.message}") unless app.errored?
+ rescue Kubeclient::HttpError
+ app.make_errored!("Kubernetes error") unless app.errored?
end
private
@@ -27,7 +27,7 @@ module Clusters
end
def on_failed
- app.make_errored!(installation_errors || 'Installation silently failed')
+ app.make_errored!('Installation failed')
ensure
remove_installation_pod
end
diff --git a/app/services/clusters/applications/install_service.rb b/app/services/clusters/applications/install_service.rb
index 7e3c0e77a83..dd8d2ed5eb6 100644
--- a/app/services/clusters/applications/install_service.rb
+++ b/app/services/clusters/applications/install_service.rb
@@ -12,10 +12,10 @@ module Clusters
ClusterWaitForAppInstallationWorker.perform_in(
ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
- rescue Kubeclient::HttpError => ke
- app.make_errored!("Kubernetes error: #{ke.message}")
- rescue StandardError => e
- app.make_errored!("Can't start installation process. #{e.message}")
+ rescue Kubeclient::HttpError
+ app.make_errored!("Kubernetes error.")
+ rescue StandardError
+ app.make_errored!("Can't start installation process.")
end
end
end