fix merge error

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

Hide file tree

Showing 3 changed files with 1 addition and 53 deletions.
diff --git a/internal/dinosaur/pkg/routes/route_loader.go b/internal/dinosaur/pkg/routes/route_loader.go
@@ -269,12 +269,6 @@ func (s *options) buildAPIBaseRouter(mainRouter *mux.Router, basePath string, op
 			Methods(http.MethodPost)
 	}
 
-	if features.ClusterMigration.Enabled() {
-		adminCentralsRouter.HandleFunc("/{id}/assign-cluster", adminCentralHandler.AssignCluster).
-			Name(logger.NewLogEvent("admin-central-assign-cluster", "[admin] change central cluster assignment").ToString()).
-			Methods(http.MethodPost)
-	}
-
 	adminCentralsRouter.HandleFunc("/{id}/traits", adminCentralHandler.ListTraits).
 		Name(logger.NewLogEvent("admin-list-traits", "[admin] list central traits").ToString()).
 		Methods(http.MethodGet)

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