engine: don't parallelize uncategorized yaml with other yaml. Fixes https://github.com/tilt-dev/tilt/issues/3421

internal/engine/buildcontrol/build_control.go

@@ -32,6 +32,15 @@ func NextTargetToBuild(state store.EngineState) *store.ManifestTarget {
 		targets = RemoveLocalTargets(targets)
 	}
 
+	// Uncategorized YAML might contain namespaces or volumes that
+	// we don't want to parallelize.
+	//
+	// TODO(nick): Long-term, we should try to infer dependencies between Kuberentes
+	// resources. A general library might make sense.
+	if IsBuildingUncategorizedYAML(state) {
+		targets = RemoveK8sTargets(targets)
+	}
+
 	targets = RemoveTargetsWithBuildingComponents(targets)
 	targets = RemoveTargetsWaitingOnDependencies(state, targets)
 
@@ -201,6 +210,16 @@ func RemoveLocalTargets(targets []*store.ManifestTarget) []*store.ManifestTarget
 	return result
 }
 
+func RemoveK8sTargets(targets []*store.ManifestTarget) []*store.ManifestTarget {
+	result := []*store.ManifestTarget{}
+	for _, target := range targets {
+		if !target.Manifest.IsK8s() {
+			result = append(result, target)
+		}
+	}
+	return result
+}
+
 func IsBuildingAnything(state store.EngineState) bool {
 	mts := state.Targets()
 	for _, mt := range mts {
@@ -221,6 +240,16 @@ func IsBuildingLocalTarget(state store.EngineState) bool {
 	return false
 }
 
+func IsBuildingUncategorizedYAML(state store.EngineState) bool {
+	mts := state.Targets()
+	for _, mt := range mts {
+		if mt.State.IsBuilding() && mt.Manifest.Name == model.UnresourcedYAMLManifestName {
+			return true
+		}
+	}
+	return false
+}
+
 // Go through all the manifests, and check:
 // 1) all pending file changes
 // 2) all pending dependency changes (where an image has been rebuilt by another manifest), and

internal/engine/buildcontrol/build_control_test.go

@@ -48,6 +48,19 @@ func TestCurrentlyBuildingK8sResourceDisablesLocalScheduling(t *testing.T) {
 	f.assertNoTargetNextToBuild()
 }
 
+func TestCurrentlyBuildingUncategorizedDisablesOtherK8sTargets(t *testing.T) {
+	f := newTestFixture(t)
+	defer f.TearDown()
+
+	_ = f.upsertK8sManifest("k8s1")
+	k8sUnresourced := f.upsertK8sManifest(model.UnresourcedYAMLManifestName)
+	_ = f.upsertK8sManifest("k8s2")
+
+	f.assertNextTargetToBuild(model.UnresourcedYAMLManifestName)
+	k8sUnresourced.State.CurrentBuild = model.BuildRecord{StartTime: time.Now()}
+	f.assertNoTargetNextToBuild()
+}
+
 func TestCurrentlyBuildingLocalResourceDisablesK8sScheduling(t *testing.T) {
 	f := newTestFixture(t)
 	defer f.TearDown()