Fix e2e2 test

Author: josvazg

config/samples/atlas_generated_v1_flexcluster_with_groupref.yaml

@@ -1,27 +1,27 @@
 apiVersion: atlas.generated.mongodb.com/v1
 kind: Group
 metadata:
-  name: my-group
+  name: my-group-for-flexcluster
 spec:
   connectionSecretRef:
     name: mongodb-atlas-operator-api-key
   v20250312:
     entry:
       orgId: "60f1b3c4e4b0e8b8c8b8c8b"
-      name: my-group
+      name: my-group-for-flexcluster
 ---
 apiVersion: atlas.generated.mongodb.com/v1
 kind: FlexCluster
 metadata:
-  name: flexy
+  name: flexy-with-groupref
   annotations:
     some-tag: tag
 spec:
   v20250312:
     groupRef:
-      name: my-group
+      name: my-group-for-flexcluster
     entry:
-      name: flexy
+      name: flexy-with-groupref
       terminationProtectionEnabled: true
       providerSettings:
         backingProviderName: GCP

internal/generated/controller/flexcluster/handler_v20250312.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312009/admin"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	builder "sigs.k8s.io/controller-runtime/pkg/builder"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
@@ -71,6 +72,26 @@ func (h *Handlerv20250312) getDependencies(ctx context.Context, flexcluster *ako
 	return result, nil
 }
 
+// getMinimalGroupFromStatusOrSpec creates a minimal Group object with group ID from status (preferred) or spec (fallback).
+// Returns nil if no group ID is available. This allows deletion to proceed even if the Group CR is gone from Kubernetes.
+func (h *Handlerv20250312) getMinimalGroupFromStatusOrSpec(flexcluster *akov2generated.FlexCluster) *akov2generated.Group {
+	var groupID *string
+	if flexcluster.Status.V20250312 != nil {
+		groupID = flexcluster.Status.V20250312.GroupId
+	}
+	if groupID == nil && flexcluster.Spec.V20250312 != nil {
+		groupID = flexcluster.Spec.V20250312.GroupId
+	}
+	if groupID == nil || *groupID == "" {
+		return nil
+	}
+	return &akov2generated.Group{
+		Status: akov2generated.GroupStatus{
+			V20250312: &akov2generated.GroupStatusV20250312{Id: groupID},
+		},
+	}
+}
+
 // HandleInitial handles the initial state for version v20250312
 func (h *Handlerv20250312) HandleInitial(ctx context.Context, flexcluster *akov2generated.FlexCluster) (ctrlstate.Result, error) {
 	deps, err := h.getDependencies(ctx, flexcluster)
@@ -165,7 +186,18 @@ func (h *Handlerv20250312) HandleDeletionRequested(ctx context.Context, flexclus
 
 	deps, err := h.getDependencies(ctx, flexcluster)
 	if err != nil {
-		return result.Error(state.StateDeletionRequested, fmt.Errorf("failed to get dependencies: %w", err))
+		// Race condition: Group CR may be deleted from K8s before FlexCluster finishes deletion.
+		// If Group is not found but we have group ID in status, use it to proceed with deletion.
+		var statusErr *apierrors.StatusError
+		if errors.As(err, &statusErr) && apierrors.IsNotFound(statusErr) {
+			if group := h.getMinimalGroupFromStatusOrSpec(flexcluster); group != nil {
+				deps = []client.Object{group}
+			} else {
+				return result.Error(state.StateDeletionRequested, fmt.Errorf("failed to get dependencies: %w", err))
+			}
+		} else {
+			return result.Error(state.StateDeletionRequested, fmt.Errorf("failed to get dependencies: %w", err))
+		}
 	}
 
 	params := &v20250312sdk.DeleteFlexClusterApiParams{}
@@ -189,7 +221,18 @@ func (h *Handlerv20250312) HandleDeletionRequested(ctx context.Context, flexclus
 func (h *Handlerv20250312) HandleDeleting(ctx context.Context, flexcluster *akov2generated.FlexCluster) (ctrlstate.Result, error) {
 	deps, err := h.getDependencies(ctx, flexcluster)
 	if err != nil {
-		return result.Error(state.StateDeleting, fmt.Errorf("failed to get dependencies: %w", err))
+		// Race condition: Group CR may be deleted from K8s before FlexCluster finishes deletion.
+		// If Group is not found but we have group ID in status, use it to proceed with deletion.
+		var statusErr *apierrors.StatusError
+		if errors.As(err, &statusErr) && apierrors.IsNotFound(statusErr) {
+			if group := h.getMinimalGroupFromStatusOrSpec(flexcluster); group != nil {
+				deps = []client.Object{group}
+			} else {
+				return result.Error(state.StateDeleting, fmt.Errorf("failed to get dependencies: %w", err))
+			}
+		} else {
+			return result.Error(state.StateDeleting, fmt.Errorf("failed to get dependencies: %w", err))
+		}
 	}
 
 	params := &v20250312sdk.GetFlexClusterApiParams{}

test/e2e2/e2e2_suite_test.go

@@ -15,8 +15,11 @@
 package e2e2_test
 
 import (
+	"context"
 	"fmt"
 	"os"
+	"os/signal"
+	"syscall"
 	"testing"
 	"time"
 
@@ -86,3 +89,35 @@ func runTestAKO(globalCreds, ns string, deletionprotection bool) operator.Operat
 	args = append(args, fmt.Sprintf("--object-deletion-protection=%v", deletionprotection))
 	return operator.NewOperator(operator.AllNamespacesOperatorEnv(ns), os.Stdout, os.Stderr, args...)
 }
+
+// SetupTerminationHandling sets up signal handling and context cancellation for an operator.
+// It handles SIGINT/SIGTERM signals and context cancellation to properly stop the operator.
+// Returns a cleanup function that should be called with DeferCleanup.
+func SetupTerminationHandling(ctx context.Context, op operator.Operator, cancel context.CancelFunc) func() {
+	// Wire up signal handling to cancel context and stop operator on SIGINT/SIGTERM
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
+	go func() {
+		defer GinkgoRecover()
+		<-sigChan
+		cancel()
+		// Stop the operator immediately when Ctrl+C is pressed
+		if op != nil {
+			op.Stop(GinkgoT())
+		}
+	}()
+
+	// Also stop operator when context is cancelled (e.g., from cleanup)
+	go func() {
+		defer GinkgoRecover()
+		<-ctx.Done()
+		if op != nil {
+			op.Stop(GinkgoT())
+		}
+	}()
+
+	// Return cleanup function to stop signal handling
+	return func() {
+		signal.Stop(sigChan)
+	}
+}