cli: skip kubeconfig minification if no k8s deploy commands (#6558)

nicks · web-flow · commit 0b2f9287b290 · 2025-05-29T11:18:14.000-04:00
fixes #6557 Signed-off-by: Nick Santos <nick.santos@docker.com>
diff --git a/integration/onedc_test.go b/integration/onedc_test.go
@@ -11,6 +11,9 @@ import (
 )
 
 func TestOneDockerCompose(t *testing.T) {
+	// Make sure a broken kubeconfig has no effect on docker compose.
+	t.Setenv("KUBECONFIG", "/path/does/not/exist/kubeconfig")
+
 	f := newDCFixture(t, "onedc")
 	f.dockerKillAll("tilt")
 	f.TiltUp()
diff --git a/internal/cli/down.go b/internal/cli/down.go
@@ -177,22 +177,29 @@ func manifestsForNode(node *dependencyNode) []model.Manifest {
 func deleteK8sEntities(ctx context.Context, manifests []model.Manifest, updateSettings model.UpdateSettings, downDeps DownDeps, deleteNamespaces bool) error {
 	kubeconfigWriter := downDeps.kubeconfigWriter
 	kClient := downDeps.kClient
-	kubeconfigPath, err := kubeconfigWriter.WriteFrozenKubeConfig(
-		ctx,
-		types.NamespacedName{Name: v1alpha1.ClusterNameDefault},
-		kClient.APIConfig())
-	if err != nil {
-		return errors.Wrap(err, "Writing kubeconfig connection")
-	}
-	defer func() {
-		_ = downDeps.fs.Remove(kubeconfigPath)
-	}()
 
 	entities, deleteCmds, err := k8sToDelete(manifests...)
 	if err != nil {
 		return errors.Wrap(err, "Parsing manifest YAML")
 	}
 
+	// If we need to inject the kubeconfig into external
+	// commands, freeze it first, so that we capture all the cli flags.
+	kubeconfigPath := ""
+	if len(deleteCmds) > 0 {
+		var err error
+		kubeconfigPath, err = kubeconfigWriter.WriteFrozenKubeConfig(
+			ctx,
+			types.NamespacedName{Name: v1alpha1.ClusterNameDefault},
+			kClient.APIConfig())
+		if err != nil {
+			return errors.Wrap(err, "Writing kubeconfig connection")
+		}
+		defer func() {
+			_ = downDeps.fs.Remove(kubeconfigPath)
+		}()
+	}
+
 	entities, _, err = k8s.Filter(entities, func(e k8s.K8sEntity) (b bool, err error) {
 		downPolicy, exists := e.Annotations()["tilt.dev/down-policy"]
 		return !exists || downPolicy != "keep", nil
diff --git a/internal/cli/down_test.go b/internal/cli/down_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/pkg/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
@@ -273,6 +274,15 @@ func TestDownK8sDeleteCmd_Error(t *testing.T) {
 	}
 }
 
+func TestDownDockerComposeWithExplodingKubeConfig(t *testing.T) {
+	f := newDownFixture(t)
+
+	f.deps.kClient = k8s.NewExplodingClient(errors.New("could not set up kubernetes client"))
+	f.tfl.Result = newTiltfileLoadResult(newDCManifest())
+	err := f.cmd.down(f.ctx, f.deps, nil)
+	assert.NoError(t, err)
+}
+
 func TestDownDCFails(t *testing.T) {
 	f := newDownFixture(t)
 
diff --git a/internal/k8s/exploding_client.go b/internal/k8s/exploding_client.go
@@ -25,6 +25,12 @@ type explodingClient struct {
 	err error
 }
 
+func NewExplodingClient(err error) Client {
+	return &explodingClient{
+		err: err,
+	}
+}
+
 func (ec *explodingClient) Upsert(ctx context.Context, entities []K8sEntity, timeout time.Duration) ([]K8sEntity, error) {
 	return nil, errors.Wrap(ec.err, "could not set up kubernetes client")
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestOneDockerCompose(t *testing.T) {`
	`14`	`+ // Make sure a broken kubeconfig has no effect on docker compose.`
	`15`	`+ t.Setenv("KUBECONFIG", "/path/does/not/exist/kubeconfig")`
	`16`	`+`
`14`	`17`	`f := newDCFixture(t, "onedc")`
`15`	`18`	`f.dockerKillAll("tilt")`
`16`	`19`	`f.TiltUp()`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,12 @@ type explodingClient struct {`
`25`	`25`	`err error`
`26`	`26`	`}`
`27`	`27`
	`28`	`+func NewExplodingClient(err error) Client {`
	`29`	`+ return &explodingClient{`
	`30`	`+ err: err,`
	`31`	`+ }`
	`32`	`+}`
	`33`	`+`
`28`	`34`	`func (ec *explodingClient) Upsert(ctx context.Context, entities []K8sEntity, timeout time.Duration) ([]K8sEntity, error) {`
`29`	`35`	`return nil, errors.Wrap(ec.err, "could not set up kubernetes client")`
`30`	`36`	`}`