Merge pull request #2494 from lizardruss/main

Local Registry being used with insecure registry

Author: FabianKramm

pkg/devspace/build/registry/util.go

@@ -3,14 +3,15 @@ package registry
 import (
 	"context"
 	"fmt"
-	"github.com/loft-sh/devspace/pkg/devspace/build/builder"
-	"github.com/loft-sh/devspace/pkg/devspace/build/builder/kaniko"
 	"io"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"net/http"
 	"runtime"
 	"strings"
 
+	"github.com/loft-sh/devspace/pkg/devspace/build/builder"
+	"github.com/loft-sh/devspace/pkg/devspace/build/builder/kaniko"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
@@ -31,6 +32,17 @@ func HasPushPermission(image *latest.Image) bool {
 	}
 
 	pushErr := remote.CheckPushPermission(ref, authn.DefaultKeychain, http.DefaultTransport)
+
+	if isInsecureRegistry(pushErr) {
+		// Retry with insecure registry
+		ref, err := name.ParseReference(image.Image, name.Insecure)
+		if err != nil {
+			panic(err)
+		}
+
+		pushErr = remote.CheckPushPermission(ref, authn.DefaultKeychain, http.DefaultTransport)
+	}
+
 	return pushErr == nil
 }
 
@@ -132,7 +144,7 @@ func UseLocalRegistry(client kubectl.Client, config *latest.Config, imageConfig
 	}
 
 	// check if node architecture equals our architecture
-	if runtime.GOARCH != "amd64" {
+	if runtime.GOARCH != "amd64" && client.KubeClient() != nil {
 		nodes, err := client.KubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
 		if err != nil {
 			return false
@@ -160,11 +172,6 @@ func UseLocalRegistry(client kubectl.Client, config *latest.Config, imageConfig
 		} else if imageConfig.BuildKit != nil && imageConfig.BuildKit.InCluster != nil {
 			return false
 		}
-
-		imageWithoutPort := strings.Split(imageConfig.Image, ":")[0]
-		if imageWithoutPort == "" || imageWithoutPort == "localhost" || imageWithoutPort == "127.0.0.1" || strings.HasSuffix(imageWithoutPort, ".local") || strings.HasSuffix(imageWithoutPort, ".localhost") {
-			return false
-		}
 	}
 
 	// check if fallback
@@ -180,3 +187,11 @@ func UseLocalRegistry(client kubectl.Client, config *latest.Config, imageConfig
 	isLocalKubernetes := kubectl.IsLocalKubernetes(context)
 	return !isLocalKubernetes && !(isVClusterContext && isLocalKubernetes)
 }
+
+func isInsecureRegistry(err error) bool {
+	if err == nil {
+		return false
+	}
+
+	return strings.Contains(err.Error(), "http: server gave HTTP response to HTTPS client")
+}

pkg/devspace/build/registry/util_test.go

@@ -11,11 +11,12 @@ import (
 )
 
 type useLocalRegistryTestCase struct {
-	name     string
-	client   kubectl.Client
-	config   *latest.Config
-	skipPush bool
-	expected bool
+	name        string
+	client      kubectl.Client
+	config      *latest.Config
+	imageConfig *latest.Image
+	skipPush    bool
+	expected    bool
 }
 
 func TestUseLocalRegistry(t *testing.T) {
@@ -304,10 +305,64 @@ func TestUseLocalRegistry(t *testing.T) {
 			},
 			expected: false,
 		},
+		{
+			name: "Remote Cluster BuildKit In Cluster Build Config",
+			client: &kubectltesting.Client{
+				Context: "arn:aws:eks:us-west-2:1234567890:cluster/remote-eks",
+			},
+			config: &latest.Config{
+				LocalRegistry: nil,
+			},
+			imageConfig: &latest.Image{
+				BuildKit: &latest.BuildKitConfig{
+					InCluster: &latest.BuildKitInClusterConfig{},
+				},
+			},
+			expected: false,
+		},
+		{
+			name: "Remote Cluster BuildKit Build Config",
+			client: &kubectltesting.Client{
+				Context: "arn:aws:eks:us-west-2:1234567890:cluster/remote-eks",
+			},
+			config: &latest.Config{
+				LocalRegistry: nil,
+			},
+			imageConfig: &latest.Image{
+				BuildKit: &latest.BuildKitConfig{},
+			},
+			expected: true,
+		},
+		{
+			name: "Remote Cluster Kaniko Build Config",
+			client: &kubectltesting.Client{
+				Context: "arn:aws:eks:us-west-2:1234567890:cluster/remote-eks",
+			},
+			config: &latest.Config{
+				LocalRegistry: nil,
+			},
+			imageConfig: &latest.Image{
+				Kaniko: &latest.KanikoConfig{},
+			},
+			expected: false,
+		},
+		{
+			name: "Remote Cluster Custom Build Config",
+			client: &kubectltesting.Client{
+				Context: "arn:aws:eks:us-west-2:1234567890:cluster/remote-eks",
+			},
+			config: &latest.Config{
+				LocalRegistry: nil,
+			},
+			imageConfig: &latest.Image{
+				Custom: &latest.CustomConfig{},
+			},
+			expected: false,
+		},
 	}
 
 	for _, testCase := range testCases {
-		actual := UseLocalRegistry(testCase.client, testCase.config, nil, nil, testCase.skipPush)
+		actual := UseLocalRegistry(testCase.client, testCase.config, testCase.imageConfig, nil, testCase.skipPush)
 		assert.Equal(t, actual, testCase.expected, "Unexpected result in test case %s", testCase.name)
 	}
 }