Merge pull request #2157 from FabianKramm/print-feat

refactor: add support for named kind clusters

Author: FabianKramm

pkg/devspace/build/builder/buildkit/buildkit.go

@@ -209,10 +209,10 @@ func buildWithCLI(ctx context.Context, dir string, context io.Reader, writer io.
 		return err
 	}
 	//load image if it is a kind-context
-	if skipPush && kubeClient != nil && kubectl.IsKindContext(kubeClient.CurrentContext()) {
+	if skipPush && kubeClient != nil && kubectl.GetKindContext(kubeClient.CurrentContext()) != "" {
 		if len(options.Tags) > 0 {
 			for _, tag := range options.Tags {
-				command := []string{"kind", "load", "docker-image", tag}
+				command := []string{"kind", "load", "docker-image", "--name", kubectl.GetKindContext(kubeClient.CurrentContext()), tag}
 				completeArgs := []string{}
 				completeArgs = append(completeArgs, command[1:]...)
 				err = command2.CommandWithEnv(ctx, dir, writer, writer, nil, minikubeEnv, command[0], completeArgs...)

pkg/devspace/build/builder/docker/docker.go

@@ -184,9 +184,9 @@ func (b *Builder) BuildImage(ctx devspacecontext.Context, contextPath, dockerfil
 	} else {
 		ctx.Log().Infof("Skip image push for %s", b.helper.ImageName)
 		//load image if it is a kind-context
-		if ctx.KubeClient() != nil && kubectl.IsKindContext(ctx.KubeClient().CurrentContext()) {
+		if ctx.KubeClient() != nil && kubectl.GetKindContext(ctx.KubeClient().CurrentContext()) != "" {
 			for _, tag := range buildOptions.Tags {
-				command := []string{"kind", "load", "docker-image", tag}
+				command := []string{"kind", "load", "docker-image", "--name", kubectl.GetKindContext(ctx.KubeClient().CurrentContext()), tag}
 				completeArgs := []string{}
 				completeArgs = append(completeArgs, command[1:]...)
 				// Determine output writer

pkg/devspace/kubectl/util.go

@@ -17,7 +17,6 @@ import (
 )
 
 const minikubeContext = "minikube"
-const kindContext = "kind-kind"
 const dockerDesktopContext = "docker-desktop"
 const dockerForDesktopContext = "docker-for-desktop"
 
@@ -203,7 +202,7 @@ func NewPortForwarder(client Client, pod *corev1.Pod, ports []string, addresses
 // IsLocalKubernetes returns true if the context belongs to a local Kubernetes cluster
 func IsLocalKubernetes(context string) bool {
 	if context == minikubeContext ||
-		context == kindContext ||
+		strings.HasPrefix(context, "kind-") ||
 		context == dockerDesktopContext ||
 		context == dockerForDesktopContext {
 		return true
@@ -214,7 +213,11 @@ func IsLocalKubernetes(context string) bool {
 	return false
 }
 
-// IsKindContext returns true if the context is a kind Kubernetes cluster
-func IsKindContext(context string) bool {
-	return context == kindContext
+// GetKindContext returns the kind cluster name
+func GetKindContext(context string) string {
+	if !strings.HasPrefix(context, "kind-") {
+		return ""
+	}
+
+	return strings.TrimPrefix(context, "kind-")
 }