chore: rabbit

Signed-off-by: Artur Shad Nik <[email protected]>

Author: arturshadnik

fleetconfig-controller/internal/controller/v1beta1/addon.go

@@ -352,14 +352,7 @@ func handleSpokeAddons(ctx context.Context, addonC *addonapi.Clientset, spoke *v
 	// do disables first, then enables/updates
 	err = handleAddonDisable(ctx, spoke, addonsToDisable)
 	if err != nil {
-		// Return current enabled addons minus disabled ones
-		currentEnabled := make([]string, 0)
-		for _, name := range enabledAddons {
-			if !slices.Contains(addonsToDisable, name) {
-				currentEnabled = append(currentEnabled, name)
-			}
-		}
-		return currentEnabled, err
+		return enabledAddons, err
 	}
 
 	// Remove disabled addons from enabled list

fleetconfig-controller/internal/controller/v1beta1/spoke_handler.go

@@ -370,14 +370,18 @@ func (r *SpokeReconciler) configureFCCAddOn(spoke *v1beta1.Spoke) {
 		return
 	}
 
-	fccIdx := 0
+	fccIdx := -1
 	for i, addon := range spoke.Spec.AddOns {
 		if addon.ConfigName == v1beta1.FCCAddOnName {
 			fccIdx = i
 			break
 		}
 	}
 
+	if fccIdx == -1 {
+		return
+	}
+
 	// Merge FCC-specific config with any existing config
 	if spoke.Spec.AddOns[fccIdx].DeploymentConfig == nil {
 		spoke.Spec.AddOns[fccIdx].DeploymentConfig = &addonv1alpha1.AddOnDeploymentConfigSpec{}