chore: address review comments

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

Author: arturshadnik

fleetconfig-controller/hack/support-bundle/serve.sh

@@ -141,7 +141,7 @@ if [[ -n "$local_bundle" ]]; then
         # Bundle is exactly the fleetconfig-support-bundle directory
         echo "Bundle is already in the expected location"
     else
-        # Bundle is outside fleetconfig-support-bundle-support-bundle, create symlink
+        # Bundle is outside fleetconfig-support-bundle, create symlink
         if [[ -d "fleetconfig-support-bundle" ]]; then
             rm -rf fleetconfig-support-bundle
         fi

fleetconfig-controller/internal/args/args_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"reflect"
+	"slices"
 	"testing"
 )
 
@@ -74,21 +75,21 @@ users:
 		defer cleanup()
 
 		if err != nil {
-			t.Fatalf("PrepareKubeconfig() error = %v", err)
+			t.Errorf("PrepareKubeconfig() error = %v", err)
 		}
 
 		// Check that kubeconfig flag is added
-		if !contains(resultArgs, "--kubeconfig") {
+		if !slices.Contains(resultArgs, "--kubeconfig") {
 			t.Error("PrepareKubeconfig() should add --kubeconfig flag")
 		}
 
 		// Check that context flag is added
-		if !contains(resultArgs, "--context") {
+		if !slices.Contains(resultArgs, "--context") {
 			t.Error("PrepareKubeconfig() should add --context flag")
 		}
 
 		// Check that the kubeconfig file exists
-		kubeconfigIndex := indexOf(resultArgs, "--kubeconfig")
+		kubeconfigIndex := slices.Index(resultArgs, "--kubeconfig")
 		if kubeconfigIndex == -1 || kubeconfigIndex+1 >= len(resultArgs) {
 			t.Fatal("PrepareKubeconfig() should add kubeconfig path")
 		}
@@ -104,15 +105,15 @@ users:
 		defer cleanup()
 
 		if err != nil {
-			t.Fatalf("PrepareKubeconfig() error = %v", err)
+			t.Errorf("PrepareKubeconfig() error = %v", err)
 		}
 
 		// Check that kubeconfig flag is added but context is not
-		if !contains(resultArgs, "--kubeconfig") {
+		if !slices.Contains(resultArgs, "--kubeconfig") {
 			t.Error("PrepareKubeconfig() should add --kubeconfig flag")
 		}
 
-		if contains(resultArgs, "--context") {
+		if slices.Contains(resultArgs, "--context") {
 			t.Error("PrepareKubeconfig() should not add --context flag when context is empty")
 		}
 	})
@@ -217,22 +218,3 @@ func TestMockResourceValues_String(t *testing.T) {
 		})
 	}
 }
-
-// Helper functions
-func contains(slice []string, item string) bool {
-	for _, s := range slice {
-		if s == item {
-			return true
-		}
-	}
-	return false
-}
-
-func indexOf(slice []string, item string) int {
-	for i, s := range slice {
-		if s == item {
-			return i
-		}
-	}
-	return -1
-}

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

@@ -128,7 +128,7 @@ func (r *SpokeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 		}
 
 		if slices.Contains(spoke.Finalizers, v1beta1.SpokeCleanupFinalizer) {
-			if err := r.cleanup(ctx, spoke, spokeKubeconfig); err != nil {
+			if err := r.cleanup(ctx, spoke, spokeKubeconfig, hubMeta); err != nil {
 				spoke.SetConditions(true, v1beta1.NewCondition(
 					err.Error(), v1beta1.CleanupFailed, metav1.ConditionTrue, metav1.ConditionFalse,
 				))
@@ -210,15 +210,9 @@ func setDefaults(ctx context.Context, spoke *v1beta1.Spoke, hubMeta hubMeta) {
 }
 
 // cleanup cleans up a Spoke and its associated resources.
-func (r *SpokeReconciler) cleanup(ctx context.Context, spoke *v1beta1.Spoke, spokeKubeconfig []byte) error {
+func (r *SpokeReconciler) cleanup(ctx context.Context, spoke *v1beta1.Spoke, spokeKubeconfig []byte, hubMeta hubMeta) error {
 	logger := log.FromContext(ctx)
 
-	hubMeta, err := r.getHubMeta(ctx, spoke.Spec.HubRef)
-	if err != nil {
-		// TODO
-		return err
-	}
-
 	clusterC, err := common.ClusterClient(hubMeta.kubeconfig)
 	if err != nil {
 		return err
@@ -454,7 +448,7 @@ func (r *SpokeReconciler) joinSpoke(ctx context.Context, spoke *v1beta1.Spoke, h
 
 	hub := hubMeta.hub
 
-	if hubMeta.hub == nil {
+	if hub == nil {
 		return errors.New("hub not found")
 	}
 	// dont start join until the hub is ready