chore: refactor exec.Stream to exec.StreamWithContext

Signed-off-by: Nico Berlee <[email protected]>

pkg/devspace/build/builder/localregistry/execconn.go

@@ -1,13 +1,14 @@
 package localregistry
 
 import (
-	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/sirupsen/logrus"
 	"io"
 	"net"
 	"sync"
 	"time"
 
+	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/sirupsen/logrus"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/remotecommand"
@@ -44,7 +45,7 @@ func ExecConn(ctx devspacecontext.Context, namespace, pod, container string, cmd
 		writer := ctx.Log().Writer(logrus.ErrorLevel, true)
 		defer writer.Close()
 
-		serr := exec.Stream(remotecommand.StreamOptions{
+		serr := exec.StreamWithContext(ctx.Context(), remotecommand.StreamOptions{
 			Stdin:  stdinR,
 			Stdout: stdoutW,
 			Stderr: writer,

pkg/devspace/kubectl/exec.go

@@ -3,8 +3,9 @@ package kubectl
 import (
 	"bytes"
 	"context"
-	"github.com/loft-sh/devspace/pkg/util/terminal"
 	"io"
+
+	"github.com/loft-sh/devspace/pkg/util/terminal"
 	"k8s.io/kubectl/pkg/util/term"
 
 	corev1 "k8s.io/api/core/v1"
@@ -106,7 +107,7 @@ func (client *client) execStreamWithTransport(ctx context.Context, options *Exec
 	errChan := make(chan error)
 	go func() {
 		errChan <- t.Safe(func() error {
-			return exec.Stream(streamOptions)
+			return exec.StreamWithContext(ctx, streamOptions)
 		})
 	}()