fix: determine helper arch automatically & fix use context

Author: FabianKramm

cmd/use/context.go

@@ -1,6 +1,7 @@
 package use
 
 import (
+	"fmt"
 	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	"github.com/loft-sh/devspace/pkg/util/factory"
@@ -34,15 +35,15 @@ devspace use context my-context
 	`,
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
-			return cmd.RunUseContext(f, cobraCmd, args)
+			return cmd.RunUseContext(f, args)
 		},
 	}
 
 	return useContext
 }
 
 // RunUseContext executes the functionality "devspace use namespace"
-func (cmd *ContextCmd) RunUseContext(f factory.Factory, cobraCmd *cobra.Command, args []string) error {
+func (cmd *ContextCmd) RunUseContext(f factory.Factory, args []string) error {
 	// Load kube-config
 	log := f.GetLog()
 	kubeLoader := f.NewKubeConfigLoader()
@@ -72,6 +73,12 @@ func (cmd *ContextCmd) RunUseContext(f factory.Factory, cobraCmd *cobra.Command,
 		}
 	}
 
+	// check if context exists
+	_, found := kubeConfig.Contexts[context]
+	if !found {
+		return fmt.Errorf("couldn't find context %s in kube config", context)
+	}
+
 	// Save old context
 	oldContext := kubeConfig.CurrentContext
 

pkg/devspace/services/inject/inject.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"io/fs"
 	"io/ioutil"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -65,6 +66,14 @@ func InjectDevSpaceHelper(ctx context.Context, client kubectl.Client, pod *v1.Po
 		} else {
 			arch = "-" + arch
 		}
+	} else {
+		// check arch on pod node
+		node, err := client.KubeClient().CoreV1().Nodes().Get(ctx, pod.Spec.NodeName, metav1.GetOptions{})
+		if err == nil {
+			if node.Labels != nil && node.Labels["beta.kubernetes.io/arch"] == "arm64" {
+				arch = "-" + string(latest.ContainerArchitectureArm64)
+			}
+		}
 	}
 
 	// Check if sync is already in pod