Merge pull request #2390 from lizardruss/local-registry-vclusters

Skip local registry use for vclusters on local kubernetes clusters

Author: FabianKramm

pkg/devspace/build/build.go

@@ -11,7 +11,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/build/types"
 	"github.com/loft-sh/devspace/pkg/devspace/config/constants"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/util/stringutil"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
@@ -89,12 +88,8 @@ func (c *controller) Build(ctx devspacecontext.Context, images []string, options
 
 	// Determine if we need to use the local registry to build any images.
 	kubeClient := ctx.KubeClient()
-	isKindContext := kubeClient != nil && kubectl.GetKindContext(kubeClient.CurrentContext()) != ""
-	useKindLoad := !registry.IsLocalRegistryEnabled(conf) && isKindContext
 	var localRegistry *registry.LocalRegistry
-	if !options.SkipPush &&
-		!useKindLoad &&
-		(registry.IsLocalRegistryEnabled(conf) || registry.IsLocalRegistryFallback(conf)) {
+	if registry.UseLocalRegistry(kubeClient, conf, options.SkipPush) {
 		ctx := ctx.WithLogger(ctx.Log().WithPrefix("local-registry: "))
 		for key, imageConf := range conf.Images {
 			imageName := imageConf.Image
@@ -106,10 +101,7 @@ func (c *controller) Build(ctx devspacecontext.Context, images []string, options
 
 			// Determine whether the local registry is required / enabled
 			isLocalReqistryRequired := !registry.HasPushPermission(imageConf)
-			useMinikubeDocker := registry.UseMinikubeDocker(ctx, imageConf)
-			if useMinikubeDocker {
-				ctx.Log().Warnf("Using Minikube for image %s, skipping local registry", imageConf.Image)
-			} else if isLocalReqistryRequired {
+			if isLocalReqistryRequired {
 				// Not able to deploy a local registry
 				if kubeClient == nil {
 					return fmt.Errorf("unable to push image %s and a valid kube context is not available", imageConf.Image)

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

@@ -139,13 +139,13 @@ func (b *Builder) BuildImage(ctx devspacecontext.Context, contextPath, dockerfil
 
 	// We skip pushing when using a local registry
 	imageCache, _ := ctx.Config().LocalCache().GetImageCache(b.helper.ImageConfigName)
-	if !usingLocalKubernetes && imageCache.IsLocalRegistryImage() {
-		b.skipPush = true
+	if usingLocalKubernetes && imageCache.IsLocalRegistryImage() {
+		b.skipPush = false
 	}
 
 	// Should we use the minikube docker daemon?
 	useMinikubeDocker := false
-	if ctx.KubeClient() != nil && ctx.KubeClient().CurrentContext() == "minikube" && (buildKitConfig.PreferMinikube == nil || *buildKitConfig.PreferMinikube) {
+	if ctx.KubeClient() != nil && kubectl.IsMinikubeKubernetes(ctx.KubeClient().CurrentContext()) && (buildKitConfig.PreferMinikube == nil || *buildKitConfig.PreferMinikube) {
 		useMinikubeDocker = true
 	}
 
@@ -235,7 +235,13 @@ func buildWithCLI(ctx context.Context, dir string, environ expand.Environ, conte
 		// Push image to local registry
 		for _, tag := range options.Tags {
 			log.Info("The push refers to repository [" + tag + "]")
-			err := registry.CopyImageToRemote(ctx, tag, writer)
+			preferMinikube := imageConf.PreferMinikube == nil || *imageConf.PreferMinikube
+			client, err := dockerpkg.NewClientWithMinikube(ctx, kubeClient.CurrentContext(), preferMinikube, log)
+			if err != nil {
+				return errors.Wrap(err, "new docker client")
+			}
+
+			err = registry.CopyImageToRemote(ctx, client, tag, writer)
 			if err != nil {
 				return errors.Errorf("error during local registry image push: %v", err)
 			}

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

@@ -212,7 +212,7 @@ func (b *Builder) BuildImage(ctx devspacecontext.Context, contextPath, dockerfil
 		// Push image to local registry
 		for _, tag := range buildOptions.Tags {
 			ctx.Log().Info("The push refers to repository [" + tag + "]")
-			err := registry.CopyImageToRemote(ctx.Context(), tag, writer)
+			err := registry.CopyImageToRemote(ctx.Context(), b.client, tag, writer)
 			if err != nil {
 				return errors.Errorf("error during local registry image push: %v", err)
 			}

pkg/devspace/build/registry/util.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/google/go-containerregistry/pkg/authn"
@@ -14,7 +15,8 @@ import (
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"github.com/google/go-containerregistry/pkg/v1/remote/transport"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
-	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	dockerclient "github.com/loft-sh/devspace/pkg/devspace/docker"
+	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -29,7 +31,7 @@ func HasPushPermission(image *latest.Image) bool {
 }
 
 func IsLocalRegistryFallback(config *latest.Config) bool {
-	return config.LocalRegistry == nil || (config.LocalRegistry != nil || config.LocalRegistry.Enabled == nil)
+	return config.LocalRegistry == nil || (config.LocalRegistry != nil && config.LocalRegistry.Enabled == nil)
 }
 
 func IsLocalRegistryEnabled(config *latest.Config) bool {
@@ -67,13 +69,13 @@ func IsImageAvailableRemotely(ctx context.Context, imageName string) (bool, erro
 	return image != nil, nil
 }
 
-func CopyImageToRemote(ctx context.Context, imageName string, writer io.Writer) error {
+func CopyImageToRemote(ctx context.Context, client dockerclient.Client, imageName string, writer io.Writer) error {
 	ref, err := name.ParseReference(imageName)
 	if err != nil {
 		return err
 	}
 
-	image, err := daemon.Image(ref, daemon.WithContext(ctx))
+	image, err := daemon.Image(ref, daemon.WithContext(ctx), daemon.WithClient(client.DockerAPIClient()))
 	if err != nil {
 		return err
 	}
@@ -118,17 +120,26 @@ func CopyImageToRemote(ctx context.Context, imageName string, writer io.Writer)
 	return <-errChan
 }
 
-func UseMinikubeDocker(ctx devspacecontext.Context, image *latest.Image) bool {
-	// preferMinikube := false
-	var preferMinikube *bool
+func UseLocalRegistry(client kubectl.Client, config *latest.Config, skipPush bool) bool {
+	if skipPush {
+		return false
+	}
 
-	if image.Docker != nil {
-		preferMinikube = image.Docker.PreferMinikube
+	if client == nil {
+		return false
 	}
 
-	if image.BuildKit != nil {
-		preferMinikube = image.BuildKit.PreferMinikube
+	if !IsLocalRegistryFallback(config) {
+		return IsLocalRegistryEnabled(config)
 	}
 
-	return ctx.KubeClient() != nil && ctx.KubeClient().CurrentContext() == "minikube" && (preferMinikube == nil || *preferMinikube)
+	context := client.CurrentContext()
+
+	// Determine if this is a vcluster
+	isVClusterContext := strings.HasPrefix(context, "vcluster_")
+
+	// Determine if this is a local kubernetes cluster
+	isLocalKubernetes := kubectl.IsLocalKubernetes(context)
+
+	return !isLocalKubernetes && !(isVClusterContext && isLocalKubernetes)
 }