fluxcd
/
helm-controller
mirror of https://github.com/fluxcd/helm-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

helm: propagate context to install and upgrade 

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals 2023-02-27 10:32:44 +01:00
parent 5f465cf7d8
commit 8a9ba1c12c
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/helmrelease_controller.go
View File

@ -364,13 +364,13 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
if rel == nil {
r.event(ctx, hr, revision, eventv1.EventSeverityInfo, "Helm install has started")
deployAction = hr.Spec.GetInstall()
rel, err = run.Install(hr, chart, values)
rel, err = run.Install(ctx, hr, chart, values)
err = r.handleHelmActionResult(ctx, &hr, revision, err, deployAction.GetDescription(),
v2.ReleasedCondition, v2.InstallSucceededReason, v2.InstallFailedReason)
} else {
r.event(ctx, hr, revision, eventv1.EventSeverityInfo, "Helm upgrade has started")
deployAction = hr.Spec.GetUpgrade()
rel, err = run.Upgrade(hr, chart, values)
rel, err = run.Upgrade(ctx, hr, chart, values)
err = r.handleHelmActionResult(ctx, &hr, revision, err, deployAction.GetDescription(),
v2.ReleasedCondition, v2.UpgradeSucceededReason, v2.UpgradeFailedReason)
}

8
internal/runner/runner.go
View File

@ -99,7 +99,7 @@ func postRenderers(hr v2.HelmRelease) (postrender.PostRenderer, error) {
}
// Install runs a Helm install action for the given v2beta1.HelmRelease.
func (r *Runner) Install(hr v2.HelmRelease, chart *chart.Chart, values chartutil.Values) (*release.Release, error) {
func (r *Runner) Install(ctx context.Context, hr v2.HelmRelease, chart *chart.Chart, values chartutil.Values) (*release.Release, error) {
r.mu.Lock()
defer r.mu.Unlock()
defer r.logBuffer.Reset()
@ -141,12 +141,12 @@ func (r *Runner) Install(hr v2.HelmRelease, chart *chart.Chart, values chartutil
}
}
rel, err := install.Run(chart, values.AsMap())
rel, err := install.RunWithContext(ctx, chart, values.AsMap())
return rel, wrapActionErr(r.logBuffer, err)
}
// Upgrade runs an Helm upgrade action for the given v2beta1.HelmRelease.
func (r *Runner) Upgrade(hr v2.HelmRelease, chart *chart.Chart, values chartutil.Values) (*release.Release, error) {
func (r *Runner) Upgrade(ctx context.Context, hr v2.HelmRelease, chart *chart.Chart, values chartutil.Values) (*release.Release, error) {
r.mu.Lock()
defer r.mu.Unlock()
defer r.logBuffer.Reset()
@ -182,7 +182,7 @@ func (r *Runner) Upgrade(hr v2.HelmRelease, chart *chart.Chart, values chartutil
}
}
rel, err := upgrade.Run(hr.GetReleaseName(), chart, values.AsMap())
rel, err := upgrade.RunWithContext(ctx, hr.GetReleaseName(), chart, values.AsMap())
return rel, wrapActionErr(r.logBuffer, err)
}