From c29e980e8a48db03095bd5a38fac7376591d4ed9 Mon Sep 17 00:00:00 2001 From: wyike Date: Thu, 14 Jul 2022 18:14:09 +0800 Subject: [PATCH] Fix: fail directly when app terminated (#4363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fail directly when app terminated Signed-off-by: 楚岳 * support suspend Signed-off-by: 楚岳 fix typo Signed-off-by: 楚岳 --- references/cli/addon.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/references/cli/addon.go b/references/cli/addon.go index 9fb8addc0..06a59fa4b 100644 --- a/references/cli/addon.go +++ b/references/cli/addon.go @@ -950,8 +950,15 @@ func waitApplicationRunning(k8sClient client.Client, addonName string) error { return client.IgnoreNotFound(err) } phase := app.Status.Phase - if phase == common2.ApplicationRunning { + switch app.Status.Phase { + case common2.ApplicationRunning: return nil + case common2.ApplicationWorkflowSuspending: + fmt.Printf("Enabling suspend, please run \"vela workflow resume %s -n vela-system\" to continue", addonutil.Addon2AppName(addonName)) + return nil + case common2.ApplicationWorkflowTerminated: + return errors.Errorf("Enabling failed, please run \"vela status %s -n vela-system\" to check the status of the addon", addonutil.Addon2AppName(addonName)) + default: } timeConsumed := int(time.Since(start).Seconds()) applySpinnerNewSuffix(spinner, fmt.Sprintf("Waiting addon application running. It is now in phase: %s (timeout %d/%d seconds)...",