fix: container selection & debug log

Author: FabianKramm

pkg/devspace/devpod/devpod.go

@@ -3,12 +3,12 @@ package devpod
 import (
 	"context"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
+	"github.com/loft-sh/devspace/pkg/devspace/kubectl/selector"
 	"github.com/loft-sh/devspace/pkg/devspace/services/logs"
 	"github.com/loft-sh/devspace/pkg/devspace/services/terminal"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/tomb"
 	"github.com/sirupsen/logrus"
-	corev1 "k8s.io/api/core/v1"
 	"os"
 	syncpkg "sync"
 
@@ -25,7 +25,7 @@ import (
 )
 
 type devPod struct {
-	selectedPod *corev1.Pod
+	selectedPod *selector.SelectedPodContainer
 
 	m syncpkg.Mutex
 
@@ -176,13 +176,14 @@ func (d *devPod) start(ctx *devspacecontext.Context, devPodConfig *latest.DevPod
 		ApplyConfigParameter("", devPodConfig.LabelSelector, imageSelector, devPodConfig.Namespace, "").
 		WithWaitingStrategy(targetselector.NewUntilNewestRunningWaitingStrategy(time.Millisecond * 500)).
 		WithSkipInitContainers(true)
-	d.selectedPod, err = targetselector.NewTargetSelector(options).SelectSinglePod(ctx.Context, ctx.KubeClient, ctx.Log)
+	d.selectedPod, err = targetselector.NewTargetSelector(options).SelectSingleContainer(ctx.Context, ctx.KubeClient, ctx.Log)
 	if err != nil {
 		return false, errors.Wrap(err, "waiting for pod to become ready")
 	}
+	ctx.Log.Debugf("Selected pod:container %s:%s", d.selectedPod.Pod.Name, d.selectedPod.Container.Name)
 
 	// start sync and port forwarding
-	err = d.startSyncAndPortForwarding(ctx, devPodConfig, newTargetSelector(d.selectedPod.Name, d.selectedPod.Namespace, parent), opts, parent)
+	err = d.startSyncAndPortForwarding(ctx, devPodConfig, newTargetSelector(d.selectedPod.Pod.Name, d.selectedPod.Pod.Namespace, d.selectedPod.Container.Name, parent), opts, parent)
 	if err != nil {
 		return false, err
 	}
@@ -204,7 +205,7 @@ func (d *devPod) startLogs(ctx *devspacecontext.Context, devPodConfig *latest.De
 		}
 
 		parent.Go(func() error {
-			return logs.StartLogs(ctx, devContainer, newTargetSelector(d.selectedPod.Name, d.selectedPod.Namespace, parent))
+			return logs.StartLogs(ctx, devContainer, newTargetSelector(d.selectedPod.Pod.Name, d.selectedPod.Pod.Namespace, d.selectedPod.Container.Name, parent))
 		})
 
 		return true
@@ -234,7 +235,7 @@ func (d *devPod) startTerminal(ctx *devspacecontext.Context, devContainer *lates
 		// make sure the global log is silent
 		before := log.GetBaseInstance().GetLevel()
 		log.GetBaseInstance().SetLevel(logrus.PanicLevel)
-		err := terminal.StartTerminal(ctx, devContainer, newTargetSelector(d.selectedPod.Name, d.selectedPod.Namespace, parent), os.Stdout, os.Stderr, os.Stdin, parent)
+		err := terminal.StartTerminal(ctx, devContainer, newTargetSelector(d.selectedPod.Pod.Name, d.selectedPod.Pod.Namespace, d.selectedPod.Container.Name, parent), os.Stdout, os.Stderr, os.Stdin, parent)
 		log.GetBaseInstance().SetLevel(before)
 		if err != nil {
 			return errors.Wrap(err, "error in terminal forwarding")

pkg/devspace/devpod/targetselector.go

@@ -18,18 +18,20 @@ func (d DevPodLostConnection) Error() string {
 	return "lost connection to pod"
 }
 
-func newTargetSelector(pod, namespace string, parent *tomb.Tomb) targetselector.TargetSelector {
+func newTargetSelector(pod, namespace, defaultContainer string, parent *tomb.Tomb) targetselector.TargetSelector {
 	return &targetSelector{
-		pod:       pod,
-		namespace: namespace,
-		parent:    parent,
+		pod:              pod,
+		namespace:        namespace,
+		defaultContainer: defaultContainer,
+		parent:           parent,
 	}
 }
 
 type targetSelector struct {
-	pod       string
-	namespace string
-	container string
+	pod              string
+	namespace        string
+	defaultContainer string
+	container        string
 
 	// parent is killed if we cannot find the
 	// pod anymore we are assigned to
@@ -46,21 +48,27 @@ func (t *targetSelector) SelectSinglePod(ctx context.Context, client kubectl.Cli
 }
 
 func (t *targetSelector) SelectSingleContainer(ctx context.Context, client kubectl.Client, log log.Logger) (*selector.SelectedPodContainer, error) {
+	container := t.container
+	if t.container == "" {
+		container = t.defaultContainer
+	}
+
 	options := targetselector.NewEmptyOptions().
 		WithPod(t.pod).
 		WithNamespace(t.namespace).
-		WithContainer(t.container).
+		WithContainer(container).
 		WithWaitingStrategy(newUntilNewestRunningWaitingStrategy(time.Millisecond*250, t.parent))
 
 	return targetselector.NewTargetSelector(options).SelectSingleContainer(ctx, client, log)
 }
 
 func (t *targetSelector) WithContainer(container string) targetselector.TargetSelector {
 	return &targetSelector{
-		pod:       t.pod,
-		namespace: t.namespace,
-		container: container,
-		parent:    t.parent,
+		pod:              t.pod,
+		namespace:        t.namespace,
+		container:        container,
+		defaultContainer: t.defaultContainer,
+		parent:           t.parent,
 	}
 }
 

pkg/devspace/kubectl/copy.go

@@ -21,6 +21,7 @@ import (
 func (client *client) CopyFromReader(ctx context.Context, pod *k8sv1.Pod, container, containerPath string, reader io.Reader) error {
 	_, stderr, err := client.ExecBuffered(ctx, pod, container, []string{"tar", "xzp", "-C", containerPath + "/."}, reader)
 	if err != nil {
+
 		if stderr != nil {
 			return errors.Errorf("error executing tar: %s: %v", string(stderr), err)
 		}

pkg/util/log/log.go

@@ -31,7 +31,7 @@ func PrintLogo() {
 
 // StartFileLogging logs the output of the global logger to the file default.log
 func StartFileLogging() {
-	defaultLog = NewUnionLogger(logrus.InfoLevel, defaultLog, GetFileLogger("default"))
+	defaultLog = NewUnionLogger(defaultLog.GetLevel(), defaultLog, GetFileLogger("default"))
 	OverrideRuntimeErrorHandler(false)
 }