feat(helm): add --use-source-hooks flag to helm 'rollback'

Signed-off-by: Jared Stehr Rivera <jared.s.rivera@gmail.com>

cmd/helm/rollback.go

@@ -80,6 +80,7 @@ func newRollbackCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.BoolVar(&client.Recreate, "recreate-pods", false, "performs pods restart for the resource if applicable")
 	f.BoolVar(&client.Force, "force", false, "force resource update through delete/recreate if needed")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "prevent hooks from running during rollback")
+	f.BoolVar(&client.UseSourceHooks, "use-source-hooks", false, "run hooks from current release during rollback")
 	f.DurationVar(&client.Timeout, "timeout", 300*time.Second, "time to wait for any individual Kubernetes operation (like Jobs for hooks)")
 	f.BoolVar(&client.Wait, "wait", false, "if set, will wait until all Pods, PVCs, Services, and minimum number of Pods of a Deployment, StatefulSet, or ReplicaSet are in a ready state before marking the release as successful. It will wait for as long as --timeout")
 	f.BoolVar(&client.WaitForJobs, "wait-for-jobs", false, "if set and --wait enabled, will wait until all Jobs have been completed before marking the release as successful. It will wait for as long as --timeout")

cmd/helm/rollback_test.go

@@ -61,6 +61,11 @@ func TestRollbackCmd(t *testing.T) {
 		cmd:    "rollback funny-honey 1 --wait --wait-for-jobs",
 		golden: "output/rollback-wait-for-jobs.txt",
 		rels:   rels,
+	}, {
+		name:   "rollback a release with source hooks",
+		cmd:    "rollback funny-honey 1 --use-source-hooks",
+		golden: "output/rollback-use-source-hooks.txt",
+		rels:   rels,
 	}, {
 		name:   "rollback a release without revision",
 		cmd:    "rollback funny-honey",

cmd/helm/testdata/output/rollback-use-source-hooks.txt

@@ -0,0 +1 @@
+Rollback was a success! Happy Helming!

pkg/action/rollback.go

@@ -35,16 +35,17 @@ import (
 type Rollback struct {
 	cfg *Configuration
 
-	Version       int
-	Timeout       time.Duration
-	Wait          bool
-	WaitForJobs   bool
-	DisableHooks  bool
-	DryRun        bool
-	Recreate      bool // will (if true) recreate pods after a rollback.
-	Force         bool // will (if true) force resource upgrade through uninstall/recreate if needed
-	CleanupOnFail bool
-	MaxHistory    int // MaxHistory limits the maximum number of revisions saved per release
+	Version        int
+	Timeout        time.Duration
+	Wait           bool
+	WaitForJobs    bool
+	DisableHooks   bool
+	UseSourceHooks bool
+	DryRun         bool
+	Recreate       bool // will (if true) recreate pods after a rollback.
+	Force          bool // will (if true) force resource upgrade through uninstall/recreate if needed
+	CleanupOnFail  bool
+	MaxHistory     int // MaxHistory limits the maximum number of revisions saved per release
 }
 
 // NewRollback creates a new Rollback object with the given configuration.
@@ -174,9 +175,16 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 		return targetRelease, errors.Wrap(err, "unable to build kubernetes objects from new release manifest")
 	}
 
+	// release whose hooks will be executed during rollback
+	releaseForHooks := targetRelease
+	if r.UseSourceHooks {
+		r.cfg.Log("Using hooks from current release")
+		releaseForHooks = currentRelease
+	}
+
 	// pre-rollback hooks
 	if !r.DisableHooks {
-		if err := r.cfg.execHook(targetRelease, release.HookPreRollback, r.Timeout); err != nil {
+		if err := r.cfg.execHook(releaseForHooks, release.HookPreRollback, r.Timeout); err != nil {
 			return targetRelease, err
 		}
 	} else {
@@ -243,7 +251,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 
 	// post-rollback hooks
 	if !r.DisableHooks {
-		if err := r.cfg.execHook(targetRelease, release.HookPostRollback, r.Timeout); err != nil {
+		if err := r.cfg.execHook(releaseForHooks, release.HookPostRollback, r.Timeout); err != nil {
 			return targetRelease, err
 		}
 	}