chore: remove ClearManagementConflictsWithKind (#1447)

The watch.Runnable interface doesn't need to know how to clear
management conflicts, because the watch.Manager already has
access to the conflict.Handler. So just clear the conflicts in
AddWatches, where it also deals with other conflicts. AddWatches
also knows that the watch is no longer needed, whereas stopWatch
only knows that it needs to be stopped.

Author: karlkfi

pkg/remediator/watch/filteredwatcher.go

@@ -73,7 +73,6 @@ const maxWatchRetryFactor = 18
 type Runnable interface {
 	Stop()
 	Run(ctx context.Context) status.Error
-	ClearManagementConflictsWithKind(gk schema.GroupKind)
 	SetLatestCommit(string)
 }
 
@@ -157,10 +156,6 @@ func (w *filteredWatcher) addError(errorID string) bool {
 	return false
 }
 
-func (w *filteredWatcher) ClearManagementConflictsWithKind(gk schema.GroupKind) {
-	w.conflictHandler.ClearConflictErrorsWithKind(gk)
-}
-
 // SetLatestCommit sets the latest observed commit which references the GVK
 // watched by this filteredWatcher.
 func (w *filteredWatcher) SetLatestCommit(commit string) {

pkg/remediator/watch/manager.go

@@ -218,6 +218,9 @@ func (m *Manager) UpdateWatches(ctx context.Context, gvkMap map[schema.GroupVers
 			// It is safe to stop the watcher.
 			m.stopWatcher(gvk)
 			stoppedWatches++
+			// Remove all conflict errors for objects with the same GK because
+			// the objects are no longer managed by the reconciler.
+			m.conflictHandler.ClearConflictErrorsWithKind(gvk.GroupKind())
 		}
 	}
 
@@ -322,8 +325,5 @@ func (m *Manager) stopWatcher(gvk schema.GroupVersionKind) {
 
 	// Stop the watcher.
 	w.Stop()
-	// Remove all conflict errors for objects with the same GK because the
-	// objects are no longer managed by the reconciler.
-	w.ClearManagementConflictsWithKind(gvk.GroupKind())
 	delete(m.watcherMap, gvk)
 }