refactor: code review feedback

Signed-off-by: Russell Centanni <russell.centanni@gmail.com>

Author: lizardruss

pkg/devspace/build/localregistry/deployment.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/util/ptr"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -72,7 +71,7 @@ func (r *LocalRegistry) ensureDeployment(ctx devspacecontext.Context) (*appsv1.D
 			Force:        true,
 		},
 	)
-	if err != nil && kubectl.IsIncompatibleServerError(err) {
+	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

pkg/devspace/build/localregistry/service.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -59,7 +58,7 @@ func (r *LocalRegistry) ensureService(ctx devspacecontext.Context) (*corev1.Serv
 			Force:        true,
 		},
 	)
-	if err != nil && kubectl.IsIncompatibleServerError(err) {
+	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

pkg/devspace/build/localregistry/statefulset.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -68,7 +67,7 @@ func (r *LocalRegistry) ensureStatefulset(ctx devspacecontext.Context) (*appsv1.
 			Force:        true,
 		},
 	)
-	if err != nil && kubectl.IsIncompatibleServerError(err) {
+	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

pkg/devspace/kubectl/client.go

@@ -3,6 +3,11 @@ package kubectl
 import (
 	"context"
 	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"time"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
 	"github.com/loft-sh/devspace/pkg/devspace/kill"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl/util"
@@ -12,17 +17,12 @@ import (
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/survey"
 	"github.com/loft-sh/devspace/pkg/util/terminal"
-	"io"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"net/http"
-	"os"
-	"time"
-
 	"github.com/mgutz/ansi"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	k8sv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"

pkg/devspace/kubectl/util.go

@@ -276,13 +276,3 @@ func GetKindContext(context string) string {
 
 	return strings.TrimPrefix(context, "kind-")
 }
-
-func IsIncompatibleServerError(err error) bool {
-	// 415: Unsupported media type means we're talking to a server which doesn't support server-side apply.
-	// Also included the apiserver enabled feature: ServerSideApply=false option
-	if _, ok := err.(*kerrors.StatusError); !ok {
-		// Non-StatusError means the error isn't because the server is incompatible.
-		return false
-	}
-	return err.(*kerrors.StatusError).Status().Code == http.StatusUnsupportedMediaType
-}