ROX-16108: Remove Targeted Cluster Placement Strategy (#903)

* Remove targeted cluster placement strategy.

* Fix the FirstReadyPlacementStrategy to be a pointer

Author: ebensh

internal/dinosaur/pkg/config/dataplane_cluster_config.go

@@ -30,7 +30,6 @@ type DataplaneClusterConfig struct {
 	// 'none' to disabled scaling all together, useful in testing
 	DataPlaneClusterScalingType string `json:"dataplane_cluster_scaling_type"`
 	DataPlaneClusterConfigFile  string `json:"dataplane_cluster_config_file"`
-	DataPlaneClusterTarget      string `json:"dataplane_cluster_target"`
 	ReadOnlyUserList            userv1.OptionalNames
 	ReadOnlyUserListFile        string
 	// TODO ROX-11294 adjust or drop sre user list
@@ -318,7 +317,6 @@ func (c *DataplaneClusterConfig) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&c.FleetshardOperatorOLMConfig.Namespace, "fleetshard-operator-namespace", c.FleetshardOperatorOLMConfig.Namespace, "fleetshard operator namespace")
 	fs.StringVar(&c.FleetshardOperatorOLMConfig.Package, "fleetshard-operator-package", c.FleetshardOperatorOLMConfig.Package, "fleetshard operator package")
 	fs.StringVar(&c.FleetshardOperatorOLMConfig.SubscriptionChannel, "fleetshard-operator-sub-channel", c.FleetshardOperatorOLMConfig.SubscriptionChannel, "fleetshard operator subscription channel")
-	fs.StringVar(&c.DataPlaneClusterTarget, "dataplane-cluster-target", "", "specify cluster by ID on which new centrals should be created")
 }
 
 // ReadFiles ...

internal/dinosaur/pkg/services/cluster_placement_strategy.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"errors"
-	"fmt"
 	"strings"
 
 	"github.com/stackrox/acs-fleet-manager/internal/dinosaur/pkg/api/dbapi"
@@ -22,18 +21,7 @@ type ClusterPlacementStrategy interface {
 // placement configuration. An appropriate ClusterPlacementStrategy implementation
 // is returned based on the received parameters content
 func NewClusterPlacementStrategy(clusterService ClusterService, dataplaneClusterConfig *config.DataplaneClusterConfig) ClusterPlacementStrategy {
-	var clusterSelection ClusterPlacementStrategy
-	if dataplaneClusterConfig.DataPlaneClusterTarget != "" {
-		clusterSelection = TargetClusterPlacementStrategy{
-			targetClusterID: dataplaneClusterConfig.DataPlaneClusterTarget,
-			clusterService:  clusterService}
-	} else {
-		clusterSelection = FirstReadyPlacementStrategy{
-			clusterService: clusterService,
-		}
-	}
-
-	return clusterSelection
+	return &FirstReadyPlacementStrategy{clusterService: clusterService}
 }
 
 var _ ClusterPlacementStrategy = (*FirstReadyPlacementStrategy)(nil)
@@ -59,32 +47,6 @@ func (d FirstReadyPlacementStrategy) FindCluster(central *dbapi.CentralRequest)
 	return nil, errors.New("no schedulable cluster found")
 }
 
-var _ ClusterPlacementStrategy = TargetClusterPlacementStrategy{}
-
-// TargetClusterPlacementStrategy implements the ClusterPlacementStrategy to always return the same cluster
-type TargetClusterPlacementStrategy struct {
-	targetClusterID string
-	clusterService  ClusterService
-}
-
-// FindCluster returns the target cluster of the placement strategy if found in the cluster list
-func (f TargetClusterPlacementStrategy) FindCluster(central *dbapi.CentralRequest) (*api.Cluster, error) {
-	cluster, err := f.clusterService.FindClusterByID(f.targetClusterID)
-	if err != nil {
-		return nil, err
-	}
-
-	if !supportsInstanceType(cluster, central.InstanceType) {
-		return nil, fmt.Errorf("target cluster %s, does not support instance type %s", f.targetClusterID, central.InstanceType)
-	}
-
-	if cluster != nil {
-		return cluster, nil
-	}
-
-	return nil, fmt.Errorf("target cluster %v not found in cluster list", f.targetClusterID)
-}
-
 func supportsInstanceType(c *api.Cluster, instanceType string) bool {
 	supportedTypes := strings.Split(c.SupportedInstanceType, ",")
 	for _, t := range supportedTypes {

internal/dinosaur/pkg/services/cluster_placement_strategy_test.go

@@ -15,7 +15,6 @@ import (
 )
 
 func TestPlacementStrategyType(t *testing.T) {
-
 	tt := []struct {
 		description          string
 		createClusterService func() ClusterService
@@ -27,20 +26,8 @@ func TestPlacementStrategyType(t *testing.T) {
 			createClusterService: func() ClusterService {
 				return &ClusterServiceMock{}
 			},
-			dataPlaneConfig: &config.DataplaneClusterConfig{
-				DataPlaneClusterTarget: "",
-			},
-			expectedType: FirstReadyPlacementStrategy{},
-		},
-		{
-			description: "TargetClusterPlacementStrategy",
-			createClusterService: func() ClusterService {
-				return &ClusterServiceMock{}
-			},
-			dataPlaneConfig: &config.DataplaneClusterConfig{
-				DataPlaneClusterTarget: "test-cluster-id",
-			},
-			expectedType: TargetClusterPlacementStrategy{},
+			dataPlaneConfig: &config.DataplaneClusterConfig{},
+			expectedType:    &FirstReadyPlacementStrategy{},
 		},
 	}