feat: push images if load is disabled for kind or k3d

Author: shaxbee

pkg/skaffold/config/util.go

@@ -183,11 +183,7 @@ func GetLocalCluster(configFile string, minikubeProfile string, detectMinikubeCl
 		return *cfg.LocalCluster, nil
 	}
 
-	config, err := kubectx.CurrentConfig()
-	if err != nil {
-		return true, err
-	}
-	return isDefaultLocal(config.CurrentContext, detectMinikubeCluster), nil
+	return isDefaultLocal(configFile, detectMinikubeCluster)
 }
 
 func GetInsecureRegistries(configFile string) ([]string, error) {
@@ -229,18 +225,31 @@ func IsImageLoadingRequired(configFile string) (bool, error) {
 		(IsK3dCluster(kubeContext) && !k3dDisableLoad), nil
 }
 
-func isDefaultLocal(kubeContext string, detectMinikubeCluster bool) bool {
+func isDefaultLocal(configFile string, detectMinikubeCluster bool) (bool, error) {
+	cfg, err := GetConfigForCurrentKubectx(configFile)
+	if err != nil {
+		return false, err
+	}
+
+	kubeContext := cfg.Kubecontext
+
+	imageLoadingRequired, err := IsImageLoadingRequired(configFile)
+	if err != nil {
+		return false, err
+	}
+
 	if kubeContext == constants.DefaultMinikubeContext ||
 		kubeContext == constants.DefaultDockerForDesktopContext ||
 		kubeContext == constants.DefaultDockerDesktopContext ||
-		IsKindCluster(kubeContext) ||
-		IsK3dCluster(kubeContext) {
-		return true
+		imageLoadingRequired {
+		return true, nil
 	}
+
 	if detectMinikubeCluster {
-		return cluster.GetClient().IsMinikube(kubeContext)
+		return cluster.GetClient().IsMinikube(kubeContext), nil
 	}
-	return false
+
+	return false, nil
 }
 
 // IsKindCluster checks that the given `kubeContext` is talking to `kind`.

pkg/skaffold/config/util_test.go

@@ -267,27 +267,30 @@ func TestIsUpdateCheckEnabled(t *testing.T) {
 
 func TestIsDefaultLocal(t *testing.T) {
 	tests := []struct {
-		context       string
+		cfg           *ContextConfig
 		expectedLocal bool
 	}{
-		{context: "kind-other", expectedLocal: true},
-		{context: "kind@kind", expectedLocal: true},
-		{context: "k3d-k3s-default", expectedLocal: true},
-		{context: "docker-for-desktop", expectedLocal: true},
-		{context: "minikube", expectedLocal: true},
-		{context: "docker-desktop", expectedLocal: true},
-		{context: "anything-else", expectedLocal: false},
-		{context: "kind@blah", expectedLocal: false},
-		{context: "other-kind", expectedLocal: false},
-		{context: "not-k3d", expectedLocal: false},
+		{cfg: &ContextConfig{Kubecontext: "kind-other"}, expectedLocal: true},
+		{cfg: &ContextConfig{Kubecontext: "kind-other", KindDisableLoad: util.BoolPtr(true)}, expectedLocal: false},
+		{cfg: &ContextConfig{Kubecontext: "kind@kind"}, expectedLocal: true},
+		{cfg: &ContextConfig{Kubecontext: "k3d-k3s-default"}, expectedLocal: true},
+		{cfg: &ContextConfig{Kubecontext: "k3d-k3s-default", K3dDisableLoad: util.BoolPtr(true)}, expectedLocal: false},
+		{cfg: &ContextConfig{Kubecontext: "docker-for-desktop"}, expectedLocal: true},
+		{cfg: &ContextConfig{Kubecontext: "minikube"}, expectedLocal: true},
+		{cfg: &ContextConfig{Kubecontext: "docker-desktop"}, expectedLocal: true},
+		{cfg: &ContextConfig{Kubecontext: "anything-else"}, expectedLocal: false},
+		{cfg: &ContextConfig{Kubecontext: "kind@blah"}, expectedLocal: false},
+		{cfg: &ContextConfig{Kubecontext: "other-kind"}, expectedLocal: false},
+		{cfg: &ContextConfig{Kubecontext: "not-k3d"}, expectedLocal: false},
 	}
 	for _, test := range tests {
 		testutil.Run(t, "", func(t *testutil.T) {
+			t.Override(&GetConfigForCurrentKubectx, func(string) (*ContextConfig, error) { return test.cfg, nil })
 			t.Override(&cluster.GetClient, func() cluster.Client { return fakeClient{} })
 
-			local := isDefaultLocal(test.context, true)
+			local, _ := isDefaultLocal("dummyname", true)
 			t.CheckDeepEqual(test.expectedLocal, local)
-			local = isDefaultLocal(test.context, false)
+			local, _ = isDefaultLocal("dummyname", false)
 			t.CheckDeepEqual(test.expectedLocal, local)
 		})
 	}