ROX-27130: Fix tests

Author: ludydoo

fleetshard/pkg/central/reconciler/reconciler_test.go

@@ -64,7 +64,12 @@ var (
 		},
 	}
 
-	useRoutesReconcilerOptions = CentralReconcilerOptions{UseRoutes: true}
+	useRoutesReconcilerOptions = CentralReconcilerOptions{
+		UseRoutes: true,
+		ArgoReconcilerOptions: ArgoReconcilerOptions{
+			ArgoCdNamespace: "openshift-gitops",
+		},
+	}
 
 	defaultAuditLogConfig = config.AuditLogging{
 		Enabled:            true,
@@ -498,10 +503,10 @@ func TestReconcileDeleteWithManagedDBOverride(t *testing.T) {
 		return connection, nil
 	}
 
-	reconcilerOptions := CentralReconcilerOptions{
-		UseRoutes:        true,
-		ManagedDBEnabled: true,
-	}
+	reconcilerOptions := defaultReconcilerOptions
+	reconcilerOptions.UseRoutes = true
+	reconcilerOptions.ManagedDBEnabled = true
+
 	_, _, r := getClientTrackerAndReconciler(
 		t,
 		managedDBProvisioningClient,

fleetshard/pkg/runtime/runtime.go

@@ -11,14 +11,12 @@ import (
 	"github.com/stackrox/acs-fleet-manager/fleetshard/config"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/central/cloudprovider"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/central/cloudprovider/awsclient"
-	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/central/operator"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/central/postgres"
 	centralReconciler "github.com/stackrox/acs-fleet-manager/fleetshard/pkg/central/reconciler"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/cipher"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/cluster"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/fleetshardmetrics"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/k8s"
-	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/util"
 	"github.com/stackrox/acs-fleet-manager/internal/dinosaur/pkg/api/private"
 	fmAPI "github.com/stackrox/acs-fleet-manager/pkg/client/fleetmanager"
 	fleetmanager "github.com/stackrox/acs-fleet-manager/pkg/client/fleetmanager/impl"
@@ -38,8 +36,6 @@ type reconcilerRegistry map[string]*centralReconciler.CentralReconciler
 
 var reconciledCentralCountCache int32
 
-var lastOperatorHash [16]byte
-
 var backoff = wait.Backoff{
 	Duration: 1 * time.Second,
 	Factor:   1.5,
@@ -57,7 +53,6 @@ type Runtime struct {
 	k8sClient                     ctrlClient.Client
 	dbProvisionClient             cloudprovider.DBClient
 	statusResponseCh              chan private.DataPlaneCentralStatus
-	operatorManager               *operator.ACSOperatorManager
 	secretCipher                  cipher.Cipher
 	encryptionKeyGenerator        cipher.KeyGenerator
 	addonService                  cluster.AddonService
@@ -93,7 +88,6 @@ func NewRuntime(ctx context.Context, config *config.Config, k8sClient ctrlClient
 		}
 	}
 
-	operatorManager := operator.NewACSOperatorManager(k8sClient)
 	secretCipher, err := cipher.NewCipher(config)
 	if err != nil {
 		return nil, fmt.Errorf("creating secretCipher: %w", err)
@@ -113,7 +107,6 @@ func NewRuntime(ctx context.Context, config *config.Config, k8sClient ctrlClient
 		clusterID:                     config.ClusterID,
 		dbProvisionClient:             dbProvisionClient,
 		reconcilers:                   make(reconcilerRegistry),
-		operatorManager:               operatorManager,
 		secretCipher:                  secretCipher, // pragma: allowlist secret
 		encryptionKeyGenerator:        encryptionKeyGen,
 		addonService:                  addonService,
@@ -286,28 +279,6 @@ func (r *Runtime) deleteStaleReconcilers(list *private.ManagedCentralList) {
 	}
 }
 
-func (r *Runtime) upgradeOperator(list private.ManagedCentralList) error {
-	ctx := context.Background()
-	operators := operator.FromAPIResponse(list.RhacsOperators)
-
-	operatorHash, err := util.MD5SumFromJSONStruct(operators)
-	if err != nil {
-		return fmt.Errorf("Creating MD5 operatorHash for operator. %w", err)
-	}
-	if lastOperatorHash == operatorHash {
-		return nil
-	}
-	lastOperatorHash = operatorHash
-
-	err = r.operatorManager.InstallOrUpgrade(ctx, operators)
-	if err != nil {
-		lastOperatorHash = [16]byte{}
-		return fmt.Errorf("ensuring initial operator installation failed: %w", err)
-	}
-
-	return nil
-}
-
 func (r *Runtime) routesAvailable() bool {
 	available, err := k8s.IsRoutesResourceEnabled(r.k8sClient)
 	if err != nil {

internal/dinosaur/pkg/gitops/config.go

@@ -4,16 +4,13 @@ package gitops
 import (
 	"fmt"
 	"github.com/stackrox/acs-fleet-manager/internal/dinosaur/pkg/api/private"
-
-	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/central/operator"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
 // Config represents the gitops configuration
 type Config struct {
 	TenantResources        TenantResourceConfig           `json:"tenantResources"`
 	Centrals               CentralsConfig                 `json:"centrals"`
-	RHACSOperators         operator.OperatorConfigs       `json:"rhacsOperators"`
 	DataPlaneClusters      []DataPlaneClusterConfig       `json:"dataPlaneClusters"`
 	VerticalPodAutoscaling private.VerticalPodAutoscaling `json:"verticalPodAutoscaling"`
 	Applications           []map[string]interface{}       `json:"applications"`
@@ -103,7 +100,6 @@ func ValidateConfig(config Config) field.ErrorList {
 	var errs field.ErrorList
 	errs = append(errs, validateCentralsConfig(field.NewPath("centrals"), config.Centrals)...)
 	errs = append(errs, validateTenantResourcesConfig(field.NewPath("tenantResources"), config.TenantResources)...)
-	errs = append(errs, operator.Validate(field.NewPath("rhacsOperators"), config.RHACSOperators)...)
 	errs = append(errs, validateDataPlaneClusterConfigs(field.NewPath("dataPlaneClusters"), config.DataPlaneClusters)...)
 	errs = append(errs, validateVpaConfig(field.NewPath("verticalPodAutoscaling"), &config.VerticalPodAutoscaling)...)
 	return errs