Merge pull request #620 from fluxcd/helm-action-ctx

helm: propagate context to install and upgrade

Author: hiddeco

controllers/helmrelease_controller.go

@@ -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)
 	}

internal/runner/runner.go

@@ -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)
 }