Skip to content

Commit 34b53ca

Browse files
author
Sinelnikov Michail
committed
fix
Signed-off-by: Sinelnikov Michail <mikhail.sinelnikov@flant.com>
1 parent 9099b49 commit 34b53ca

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

pkg/helm/nelm/nelm.go

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -241,18 +241,19 @@ func (c *NelmClient) UpgradeRelease(releaseName, modulePath string, valuesPaths
241241
NoPodLogs: true,
242242
NoFinalTracking: true,
243243
},
244-
Chart: modulePath,
245-
DefaultChartName: releaseName,
246-
DefaultChartVersion: "0.2.0",
247-
DefaultChartAPIVersion: "v2",
248-
ExtraLabels: c.labels,
249-
ExtraAnnotations: extraAnnotations,
250-
NoInstallStandaloneCRDs: true,
251-
ReleaseHistoryLimit: int(c.opts.HistoryMax),
252-
ReleaseLabels: releaseLabels,
253-
ReleaseStorageDriver: c.opts.HelmDriver,
254-
Timeout: c.opts.Timeout,
255-
ForceAdoption: true,
244+
Chart: modulePath,
245+
DefaultChartName: releaseName,
246+
DefaultChartVersion: "0.2.0",
247+
DefaultChartAPIVersion: "v2",
248+
DefaultDeletePropagation: "Background",
249+
ExtraLabels: c.labels,
250+
ExtraAnnotations: extraAnnotations,
251+
NoInstallStandaloneCRDs: true,
252+
ReleaseHistoryLimit: int(c.opts.HistoryMax),
253+
ReleaseLabels: releaseLabels,
254+
ReleaseStorageDriver: c.opts.HelmDriver,
255+
Timeout: c.opts.Timeout,
256+
ForceAdoption: true,
256257
}); err != nil {
257258
return fmt.Errorf("install nelm release %q: %w", releaseName, err)
258259
}
@@ -337,9 +338,10 @@ func (c *NelmClient) DeleteRelease(releaseName string) error {
337338
NoPodLogs: true,
338339
NoFinalTracking: true,
339340
},
340-
ReleaseHistoryLimit: int(c.opts.HistoryMax),
341-
ReleaseStorageDriver: c.opts.HelmDriver,
342-
Timeout: c.opts.Timeout,
341+
ReleaseHistoryLimit: int(c.opts.HistoryMax),
342+
DefaultDeletePropagation: "Background",
343+
ReleaseStorageDriver: c.opts.HelmDriver,
344+
Timeout: c.opts.Timeout,
343345
}); err != nil {
344346
return fmt.Errorf("nelm uninstall release %q: %w", releaseName, err)
345347
}

0 commit comments

Comments
 (0)