dockercomposeservice: fix race conditions (#6718)

- one missing mutex lock
- one flaky test

Signed-off-by: Nick Santos <nicholas.j.santos@gmail.com>

Author: nicks

internal/controllers/core/dockercomposeservice/disable_watcher_test.go

@@ -37,8 +37,11 @@ Going to remove servantes_fortune_1
 	f.clock.Advance(20 * disableDebounceDelay)
 	f.startTime = f.clock.Now()
 
-	f.log.AssertEventuallyContains(t, "Stopping servantes", time.Second)
 	expectedOutput := strings.Replace(f.dcClient.RmOutput, "Going to remove servantes_fortune_1\n", "", -1)
+	// Wait for the last expected line to ensure all output has been written to the log.
+	// filteredWriter writes each line individually, so checking for an early line
+	// (e.g. "Stopping servantes") can race with later lines not yet being written.
+	f.log.AssertEventuallyContains(t, "Removing servantes_fortune_1 ... done", time.Second)
 	require.Equal(t, expectedOutput, f.log.String())
 }
 

internal/controllers/core/dockercomposeservice/reconciler.go

@@ -443,10 +443,12 @@ func (r *Reconciler) forceApplyHelper(
 // Update the status on the apiserver if necessary.
 func (r *Reconciler) maybeUpdateStatus(ctx context.Context, nn types.NamespacedName, obj *v1alpha1.DockerComposeService) error {
 	newStatus := v1alpha1.DockerComposeServiceStatus{}
+	r.mu.Lock()
 	existing, ok := r.results[nn]
 	if ok {
 		newStatus = existing.Status
 	}
+	r.mu.Unlock()
 
 	if apicmp.DeepEqual(obj.Status, newStatus) {
 		return nil