WIP: initial try to handle spoke and hub deletions from operator

Author: darkdoc

api/v1alpha1/pattern_types.go

@@ -206,6 +206,10 @@ type PatternStatus struct {
 	AnalyticsUUID string `json:"analyticsUUID,omitempty"`
 	// +operator-sdk:csv:customresourcedefinitions:type=status
 	LocalCheckoutPath string `json:"path,omitempty"`
+	// +operator-sdk:csv:customresourcedefinitions:type=status
+	// DeletionPhase tracks the current phase of pattern deletion
+	// Values: "" (not deleting), "deletingSpokeApps" (phase 1: delete apps from spoke), "deletingHubApps" (phase 2: delete apps from hub)
+	DeletionPhase string `json:"deletionPhase,omitempty"`
 }
 
 // See: https://book.kubebuilder.io/reference/markers/crd.html

config/crd/bases/gitops.hybrid-cloud-patterns.io_patterns.yaml

@@ -224,6 +224,11 @@ spec:
                   - type
                   type: object
                 type: array
+              deletionPhase:
+                description: |-
+                  DeletionPhase tracks the current phase of pattern deletion
+                  Values: "" (not deleting), "deletingSpokeApps" (phase 1: delete apps from spoke), "deletingHubApps" (phase 2: delete apps from hub)
+                type: string
               lastError:
                 description: Last error encountered by the pattern
                 type: string

go.mod

@@ -27,7 +27,10 @@ require (
 	sigs.k8s.io/controller-runtime v0.21.0
 )
 
-require github.com/argoproj/argo-cd/v3 v3.0.19
+require (
+	github.com/argoproj/argo-cd/v3 v3.0.19
+	github.com/samber/lo v1.52.0
+)
 
 require (
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect

go.sum

@@ -410,6 +410,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
+github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
 github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
 github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
 github.com/segmentio/analytics-go/v3 v3.3.0 h1:8VOMaVGBW03pdBrj1CMFfY9o/rnjJC+1wyQHlVxjw5o=

internal/controller/acm.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"log"
 
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -64,3 +65,69 @@ func haveACMHub(r *PatternReconciler) bool {
 	}
 	return true
 }
+
+// listManagedClusters lists all ManagedCluster resources (excluding local-cluster)
+// Returns a list of cluster names and an error
+func (r *PatternReconciler) listManagedClusters(ctx context.Context) ([]string, error) {
+	gvrMC := schema.GroupVersionResource{
+		Group:    "cluster.open-cluster-management.io",
+		Version:  "v1",
+		Resource: "managedclusters",
+	}
+
+	// ManagedCluster is a cluster-scoped resource, so no namespace needed
+	mcList, err := r.dynamicClient.Resource(gvrMC).List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to list ManagedClusters: %w", err)
+	}
+
+	var clusterNames []string
+	for _, item := range mcList.Items {
+		name := item.GetName()
+		// Exclude local-cluster (hub cluster)
+		if name != "local-cluster" {
+			clusterNames = append(clusterNames, name)
+		}
+	}
+
+	return clusterNames, nil
+}
+
+// deleteManagedClusters deletes all ManagedCluster resources (excluding local-cluster)
+// Returns the number of clusters deleted and an error
+func (r *PatternReconciler) deleteManagedClusters(ctx context.Context) (int, error) {
+	gvrMC := schema.GroupVersionResource{
+		Group:    "cluster.open-cluster-management.io",
+		Version:  "v1",
+		Resource: "managedclusters",
+	}
+
+	// ManagedCluster is a cluster-scoped resource, so no namespace needed
+	mcList, err := r.dynamicClient.Resource(gvrMC).List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return 0, fmt.Errorf("failed to list ManagedClusters: %w", err)
+	}
+
+	deletedCount := 0
+	for _, item := range mcList.Items {
+		name := item.GetName()
+		// Exclude local-cluster (hub cluster)
+		if name == "local-cluster" {
+			continue
+		}
+
+		// Delete the managed cluster
+		err := r.dynamicClient.Resource(gvrMC).Delete(ctx, name, metav1.DeleteOptions{})
+		if err != nil {
+			// If already deleted, that's fine
+			if kerrors.IsNotFound(err) {
+				continue
+			}
+			return deletedCount, fmt.Errorf("failed to delete ManagedCluster %q: %w", name, err)
+		}
+		log.Printf("Deleted ManagedCluster: %q", name)
+		deletedCount++
+	}
+
+	return deletedCount, nil
+}

internal/controller/argo.go

@@ -426,9 +426,16 @@ func newApplicationParameters(p *api.Pattern) []argoapi.HelmParameter {
 		}
 	}
 	if !p.DeletionTimestamp.IsZero() {
+		// Determine deletePattern value based on deletion phase
+		// Phase 1 (deletingSpokeApps): deletePattern = "2" (delete apps from spoke)
+		// Phase 2 (deletingHubApps): deletePattern = "1" (delete apps from hub)
+		deletePatternValue := "2" // default to spoke deletion
+		if p.Status.DeletionPhase == "deletingHubApps" {
+			deletePatternValue = "1"
+		}
 		parameters = append(parameters, argoapi.HelmParameter{
 			Name:        "global.deletePattern",
-			Value:       "1",
+			Value:       deletePatternValue,
 			ForceString: true,
 		})
 	}