fix merge conflict errors

stackrox · Oct 14, 2024 · b750f06 · b750f06
1 parent 28a96ed
commit b750f06
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/internal/dinosaur/pkg/services/cluster_placement_strategy.go b/internal/dinosaur/pkg/services/cluster_placement_strategy.go
@@ -13,8 +13,6 @@ import (
 type ClusterPlacementStrategy interface {
 	// FindCluster finds and returns a Cluster depends on the specific impl.
 	FindCluster(central *dbapi.CentralRequest) (*api.Cluster, error)
-	// AllMatchingClustersForCentral returns all cluster that fit the criteria to run a central
-	AllMatchingClustersForCentral(central *dbapi.CentralRequest) ([]*api.Cluster, error)
 }
 
 // NewClusterPlacementStrategy return a concrete strategy impl. depends on the

diff --git a/internal/dinosaur/pkg/services/cluster_placement_strategy_moq.go b/internal/dinosaur/pkg/services/cluster_placement_strategy_moq.go