common-instancetypes: Remove args from reconcileRemovedResources

Co-authored-by: Felix Matouschek <[email protected]>
Signed-off-by: Lee Yarwood <[email protected]>

internal/operands/common-instancetypes/reconcile.go

@@ -223,17 +223,17 @@ func reconcileRemovedPreferences(request *common.Request, existingResources []in
 	return nil
 }
 
-func (c *CommonInstancetypes) reconcileRemovedResources(request *common.Request, newInstancetypes []instancetypev1beta1.VirtualMachineClusterInstancetype, newPreferences []instancetypev1beta1.VirtualMachineClusterPreference) error {
+func (c *CommonInstancetypes) reconcileRemovedResources(request *common.Request) error {
 	existingClusterInstancetypes, existingClusterPreferences, err := c.fetchExistingResources(request)
 	if err != nil {
 		return err
 	}
 
-	if err = reconcileRemovedInstancetypes(request, existingClusterInstancetypes, newInstancetypes); err != nil {
+	if err = reconcileRemovedInstancetypes(request, existingClusterInstancetypes, c.virtualMachineClusterInstancetypes); err != nil {
 		return err
 	}
 
-	if err = reconcileRemovedPreferences(request, existingClusterPreferences, newPreferences); err != nil {
+	if err = reconcileRemovedPreferences(request, existingClusterPreferences, c.virtualMachineClusterPreferences); err != nil {
 		return err
 	}
 	return nil
@@ -249,19 +249,18 @@ func (c *CommonInstancetypes) reconcileFromURL(request *common.Request) ([]commo
 	// Cache the URL so we can check if it changes with future reconcile attempts above
 	c.resourceURL = *request.Instance.Spec.CommonInstancetypes.URL
 	request.Logger.Info(fmt.Sprintf("Reconciling common-instancetypes from URL %s", c.resourceURL))
-	clusterInstancetypesFromURL, clusterPreferencesFromURL, err := c.FetchResourcesFromURL(c.resourceURL)
+	var err error
+	c.virtualMachineClusterInstancetypes, c.virtualMachineClusterPreferences, err = c.FetchResourcesFromURL(c.resourceURL)
 	if err != nil {
 		return nil, err
 	}
 
 	// Remove any resources no longer provided by the URL, this should only happen when switching from the internal bundle to external URL for now.
-	if err = c.reconcileRemovedResources(request, clusterInstancetypesFromURL, clusterPreferencesFromURL); err != nil {
+	if err = c.reconcileRemovedResources(request); err != nil {
 		return nil, err
 	}
 
 	// Generate the normal set of reconcile funcs to create or update the provided resources
-	c.virtualMachineClusterInstancetypes = clusterInstancetypesFromURL
-	c.virtualMachineClusterPreferences = clusterPreferencesFromURL
 	reconcileFuncs, err := c.reconcileFuncs(request)
 	if err != nil {
 		return nil, err
@@ -271,18 +270,17 @@ func (c *CommonInstancetypes) reconcileFromURL(request *common.Request) ([]commo
 
 func (c *CommonInstancetypes) reconcileFromBundle(request *common.Request) ([]common.ReconcileResult, error) {
 	request.Logger.Info("Reconciling common-instancetypes from internal bundle")
-	clusterInstancetypesFromBundle, clusterPreferencesFromBundle, err := c.fetchResourcesFromBundle()
+	var err error
+	c.virtualMachineClusterInstancetypes, c.virtualMachineClusterPreferences, err = c.fetchResourcesFromBundle()
 	if err != nil {
 		return nil, err
 	}
 
 	// Remove any resources no longer provided by the bundle
-	if err = c.reconcileRemovedResources(request, clusterInstancetypesFromBundle, clusterPreferencesFromBundle); err != nil {
+	if err = c.reconcileRemovedResources(request); err != nil {
 		return nil, err
 	}
 
-	c.virtualMachineClusterInstancetypes = clusterInstancetypesFromBundle
-	c.virtualMachineClusterPreferences = clusterPreferencesFromBundle
 	reconcileFuncs, err := c.reconcileFuncs(request)
 	if err != nil {
 		return nil, err