engine: fix a bug in cluster connection checks

before this change, if you were deploying to both a DockerCompose engine and a Kube cluster, we sometimes wouldn't correctly synchronize the cluster connections. this led to problems where we would try to deploy before the connection had been established properly. fixes #6453 Signed-off-by: Nick Santos <[email protected]>
tilt-dev · Oct 30, 2024 · 68c1bf1 · 68c1bf1
1 parent af69f52
commit 68c1bf1
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/internal/engine/buildcontrol/build_control.go b/internal/engine/buildcontrol/build_control.go
@@ -1,6 +1,7 @@
 package buildcontrol
 
 import (
+	"log"
 	"time"
 
 	v1 "k8s.io/api/core/v1"
@@ -85,7 +86,11 @@ func NextTargetToBuild(state store.EngineState) (*store.ManifestTarget, HoldSet)
 	unbuilt := FindTargetsNeedingInitialBuild(targets)
 
 	if len(unbuilt) > 0 {
-		return NextUnbuiltTargetToBuild(unbuilt), holds
+		result := NextUnbuiltTargetToBuild(unbuilt)
+		if result.Manifest.Name == "ahoy0" {
+			log.Printf("DEPLOY AHOY %s", result.Manifest.Name)
+		}
+		return result, holds
 	}
 
 	// Check to see if any targets are currently being successfully reconciled,
@@ -254,7 +259,7 @@ func HoldTargetsWaitingOnCluster(state store.EngineState, mts []*store.ManifestT
 		cluster, ok := state.Clusters[clusterName]
 		isClusterOK := ok && cluster.Status.Error == "" && cluster.Status.Arch != ""
 		if isClusterOK {
-			return
+			continue
 		}
 
 		gvk := v1alpha1.SchemeGroupVersion.WithKind("Cluster")

diff --git a/internal/engine/buildcontrol/build_control_test.go b/internal/engine/buildcontrol/build_control_test.go
@@ -166,6 +166,31 @@ func TestK8sDependsOnCluster(t *testing.T) {
 	f.assertNextTargetToBuild("k8s1")
 }
 
+func TestK8sDependsOnCluster_TwoClusters(t *testing.T) {
+	f := newTestFixture(t)
+
+	f.st.Clusters["default"].Status.Error = "connection error"
+
+	_ = f.upsertK8sManifest("k8s1")
+	dc1 := f.upsertDCManifest("dc1")
+	f.assertNextTargetToBuild("dc1")
+	dc1.State.AddCompletedBuild(model.BuildRecord{
+		StartTime:  time.Now(),
+		FinishTime: time.Now(),
+	})
+	f.assertNoTargetNextToBuild()
+
+	f.assertHoldOnRefs("k8s1", store.HoldReasonCluster, v1alpha1.UIResourceStateWaitingOnRef{
+		Group:      "tilt.dev",
+		APIVersion: "v1alpha1",
+		Kind:       "Cluster",
+		Name:       "default",
+	})
+
+	f.st.Clusters["default"].Status.Error = ""
+	f.assertNextTargetToBuild("k8s1")
+}
+
 func TestCurrentlyBuildingLocalResourceDisablesK8sScheduling(t *testing.T) {
 	f := newTestFixture(t)
 
@@ -679,6 +704,11 @@ type testFixture struct {
 func newTestFixture(t *testing.T) testFixture {
 	f := tempdir.NewTempDirFixture(t)
 	st := store.NewState()
+	st.Clusters["docker"] = &v1alpha1.Cluster{
+		Status: v1alpha1.ClusterStatus{
+			Arch: "amd64",
+		},
+	}
 	st.Clusters["default"] = &v1alpha1.Cluster{
 		Status: v1alpha1.ClusterStatus{
 			Arch: "amd64",
@@ -742,6 +772,14 @@ func (f *testFixture) upsertK8sManifest(name model.ManifestName, opts ...manifes
 	return f.upsertManifest(b.WithK8sYAML(testyaml.SanchoYAML).Build())
 }
 
+func (f *testFixture) upsertDCManifest(name model.ManifestName, opts ...manifestOption) *store.ManifestTarget {
+	b := manifestbuilder.New(f, name)
+	for _, o := range opts {
+		b = o(b)
+	}
+	return f.upsertManifest(b.WithDockerCompose().Build())
+}
+
 func (f *testFixture) upsertLocalManifest(name model.ManifestName, opts ...manifestOption) *store.ManifestTarget {
 	b := manifestbuilder.New(f, name)
 	for _, o := range opts {