Merge pull request #2893 from devspace-sh/fix-415-server-side-apply

fix remote buildkit error: [415: Unsupported Media Type]

Author: lizardruss

cmd/cleanup/images.go

@@ -2,6 +2,7 @@ package cleanup
 
 import (
 	"context"
+
 	"github.com/loft-sh/devspace/pkg/devspace/docker"
 
 	"github.com/loft-sh/devspace/cmd/flags"
@@ -76,7 +77,7 @@ func (cmd *imagesCmd) RunCleanupImages(f factory.Factory, cobraCmd *cobra.Comman
 	}
 
 	config := configInterface.Config()
-	if config.Images == nil || len(config.Images) == 0 {
+	if len(config.Images) == 0 {
 		log.Done("No images found in config to delete")
 		return nil
 	}

cmd/list/ports.go

@@ -68,7 +68,7 @@ func (cmd *portsCmd) RunListPort(f factory.Factory, cobraCmd *cobra.Command, arg
 	config := configInterface.Config()
 	portForwards := make([][]string, 0)
 	for _, dev := range config.Dev {
-		if dev.Ports == nil || len(dev.Ports) == 0 {
+		if len(dev.Ports) == 0 {
 			continue
 		}
 		selector := ""

cmd/list/sync.go

@@ -2,6 +2,7 @@ package list
 
 import (
 	"context"
+
 	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/loft-sh/devspace/pkg/util/log"
@@ -57,7 +58,7 @@ func (cmd *syncCmd) RunListSync(f factory.Factory, cobraCmd *cobra.Command, args
 	syncPaths := make([][]string, 0)
 
 	for _, dev := range config.Dev {
-		if dev.Sync == nil || len(dev.Sync) == 0 {
+		if len(dev.Sync) == 0 {
 			logger.Info("No sync paths are configured.")
 			return nil
 		}

e2e/tests/sync/sync.go

@@ -596,7 +596,9 @@ var _ = DevSpaceDescribe("sync", func() {
 			defer ginkgo.GinkgoRecover()
 			defer waitGroup.Done()
 			err = syncCmd.Run(f)
-			framework.ExpectNoError(err)
+			if !errors.Is(err, context.Canceled) {
+				framework.ExpectNoError(err)
+			}
 		}()
 
 		// check that uploadExcludePaths folder was not synced

pkg/devspace/build/builder/custom/custom.go

@@ -2,12 +2,13 @@ package custom
 
 import (
 	"fmt"
+	"io"
+	"strings"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"github.com/sirupsen/logrus"
-	"io"
-	"strings"
 
 	"github.com/bmatcuk/doublestar"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
@@ -40,7 +41,7 @@ func NewBuilder(imageConf *latest.Image, imageTags []string) *Builder {
 
 // ShouldRebuild implements interface
 func (b *Builder) ShouldRebuild(ctx devspacecontext.Context, forceRebuild bool) (bool, error) {
-	if b.imageConf.Custom.OnChange == nil || len(b.imageConf.Custom.OnChange) == 0 {
+	if len(b.imageConf.Custom.OnChange) == 0 {
 		return true, nil
 	}
 

pkg/devspace/build/localregistry/deployment.go

@@ -63,14 +63,21 @@ func (r *LocalRegistry) ensureDeployment(ctx devspacecontext.Context) (*appsv1.D
 	if err != nil {
 		return nil, err
 	}
-	return ctx.KubeClient().KubeClient().AppsV1().Deployments(r.Namespace).Apply(
+	apply, err := ctx.KubeClient().KubeClient().AppsV1().Deployments(r.Namespace).Apply(
 		ctx.Context(),
 		applyConfiguration,
 		metav1.ApplyOptions{
 			FieldManager: ApplyFieldManager,
 			Force:        true,
 		},
 	)
+	if kerrors.IsUnsupportedMediaType(err) {
+		ctx.Log().Debugf("Server-side apply not available on the server for localRegistry deployment: (%v)", err)
+		// Unsupport server-side apply, we use existing or created deployment
+		return existing, nil
+	}
+
+	return apply, err
 }
 
 func (r *LocalRegistry) getDeployment() *appsv1.Deployment {

pkg/devspace/build/localregistry/service.go

@@ -50,15 +50,21 @@ func (r *LocalRegistry) ensureService(ctx devspacecontext.Context) (*corev1.Serv
 	if err != nil {
 		return nil, err
 	}
-
-	return ctx.KubeClient().KubeClient().CoreV1().Services(r.Namespace).Apply(
+	apply, err := ctx.KubeClient().KubeClient().CoreV1().Services(r.Namespace).Apply(
 		ctx.Context(),
 		applyConfiguration,
 		metav1.ApplyOptions{
 			FieldManager: ApplyFieldManager,
 			Force:        true,
 		},
 	)
+	if kerrors.IsUnsupportedMediaType(err) {
+		ctx.Log().Debugf("Server-side apply not available on the server for localRegistry service: (%v)", err)
+		// Unsupport server-side apply, we use existing or created service
+		return existing, nil
+	}
+
+	return apply, err
 }
 
 func (r *LocalRegistry) getService() *corev1.Service {

pkg/devspace/build/localregistry/statefulset.go

@@ -59,14 +59,21 @@ func (r *LocalRegistry) ensureStatefulset(ctx devspacecontext.Context) (*appsv1.
 	if err != nil {
 		return nil, err
 	}
-	return ctx.KubeClient().KubeClient().AppsV1().StatefulSets(r.Namespace).Apply(
+	apply, err := ctx.KubeClient().KubeClient().AppsV1().StatefulSets(r.Namespace).Apply(
 		ctx.Context(),
 		applyConfiguration,
 		metav1.ApplyOptions{
 			FieldManager: ApplyFieldManager,
 			Force:        true,
 		},
 	)
+	if kerrors.IsUnsupportedMediaType(err) {
+		ctx.Log().Debugf("Server-side apply not available on the server for localRegistry statefulset: (%v)", err)
+		// Unsupport server-side apply, we use existing or created statefulset
+		return existing, nil
+	}
+
+	return apply, err
 }
 
 func (r *LocalRegistry) getStatefulSet() *appsv1.StatefulSet {

pkg/devspace/config/loader/loader.go

@@ -150,7 +150,7 @@ func (l *configLoader) LoadWithParser(ctx context.Context, localCache localcache
 		var ok bool
 		name, ok = data["name"].(string)
 		if !ok {
-			return nil, fmt.Errorf("name is missing in " + filepath.Base(l.absConfigPath))
+			return nil, fmt.Errorf("name is missing in %s", filepath.Base(l.absConfigPath))
 		}
 	} else {
 		data["name"] = options.OverrideName

pkg/devspace/deploy/deploy.go

@@ -59,7 +59,7 @@ func (c *controller) Deploy(ctx devspacecontext.Context, deployments []string, o
 		return nil
 	}
 
-	if config.Deployments != nil && len(config.Deployments) > 0 {
+	if len(config.Deployments) > 0 {
 		// Execute before deployments deploy hook
 		err := hook.ExecuteHooks(ctx, nil, "before:"+event)
 		if err != nil {