Merge branch 'main' into helm-test-output-format

Signed-off-by: Simon Alling <alling.simon@gmail.com>

pkg/action/upgrade.go

@@ -321,11 +321,17 @@ func (u *Upgrade) performUpgrade(ctx context.Context, originalRelease, upgradedR
 		return nil, err
 	}
 	rChan := make(chan resultMessage)
+	ctxChan := make(chan resultMessage)
+	doneChan := make(chan interface{})
 	go u.releasingUpgrade(rChan, upgradedRelease, current, target, originalRelease)
-	go u.handleContext(ctx, rChan, upgradedRelease)
-	result := <-rChan
-
+	go u.handleContext(ctx, doneChan, ctxChan, upgradedRelease)
+	select {
+	case result := <-rChan:
+		doneChan <- true
+		return result.r, result.e
+	case result := <-ctxChan:
 		return result.r, result.e
+	}
 }
 
 // Function used to lock the Mutex, this is important for the case when the atomic flag is set.
@@ -341,13 +347,17 @@ func (u *Upgrade) reportToPerformUpgrade(c chan<- resultMessage, rel *release.Re
 }
 
 // Setup listener for SIGINT and SIGTERM
-func (u *Upgrade) handleContext(ctx context.Context, c chan<- resultMessage, upgradedRelease *release.Release) {
-
+func (u *Upgrade) handleContext(ctx context.Context, done chan interface{}, c chan<- resultMessage, upgradedRelease *release.Release) {
 	go func() {
-		<-ctx.Done()
+		select {
+		case <-ctx.Done():
 			err := ctx.Err()
+
 			// when the atomic flag is set the ongoing release finish first and doesn't give time for the rollback happens.
 			u.reportToPerformUpgrade(c, upgradedRelease, kube.ResourceList{}, err)
+		case <-done:
+			return
+		}
 	}()
 }
 func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *release.Release, current kube.ResourceList, target kube.ResourceList, originalRelease *release.Release) {