From db2cf16b6f282b347560d65b5d3603974775a742 Mon Sep 17 00:00:00 2001 From: Austin Abro Date: Mon, 30 Sep 2024 18:57:04 +0000 Subject: [PATCH] keep helm wait Signed-off-by: Austin Abro --- src/internal/packager/helm/chart.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/internal/packager/helm/chart.go b/src/internal/packager/helm/chart.go index 7455ebd5eb..059de978ab 100644 --- a/src/internal/packager/helm/chart.go +++ b/src/internal/packager/helm/chart.go @@ -306,8 +306,7 @@ func (h *Helm) installChart(ctx context.Context, postRender *renderer) (*release client.Timeout = h.timeout // Default helm behavior for Zarf is to wait for the resources to deploy, NoWait overrides that for special cases (such as data-injection). - // TODO probably will not keep this, but I want to test out if kstatus will always work - client.Wait = false + client.Wait = !h.chart.NoWait // We need to include CRDs or operator installations will fail spectacularly. client.SkipCRDs = false @@ -344,8 +343,7 @@ func (h *Helm) upgradeChart(ctx context.Context, lastRelease *release.Release, p client.Timeout = h.timeout // Default helm behavior for Zarf is to wait for the resources to deploy, NoWait overrides that for special cases (such as data-injection). - // TODO just testing if kstatus will always work - client.Wait = false + client.Wait = !h.chart.NoWait client.SkipCRDs = true