rename v2 MCP resource in controller

Author: Diaphteiros

internal/controllers/managedcontrolplane/clusters.go

@@ -18,7 +18,7 @@ import (
 	libutils "github.com/openmcp-project/openmcp-operator/lib/utils"
 )
 
-func (r *ManagedControlPlaneReconciler) deleteRelatedClusterRequests(ctx context.Context, mcp *corev2alpha1.ManagedControlPlane) (sets.Set[string], errutils.ReasonableError) {
+func (r *ManagedControlPlaneReconciler) deleteRelatedClusterRequests(ctx context.Context, mcp *corev2alpha1.ManagedControlPlaneV2) (sets.Set[string], errutils.ReasonableError) {
 	log := logging.FromContextOrPanic(ctx)
 
 	// delete depending cluster requests, if any

internal/controllers/managedcontrolplane/controller.go

@@ -65,7 +65,7 @@ type ManagedControlPlaneReconciler struct {
 
 var _ reconcile.Reconciler = &ManagedControlPlaneReconciler{}
 
-type ReconcileResult = ctrlutils.ReconcileResult[*corev2alpha1.ManagedControlPlane]
+type ReconcileResult = ctrlutils.ReconcileResult[*corev2alpha1.ManagedControlPlaneV2]
 
 func (r *ManagedControlPlaneReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
 	log := logging.FromContextOrPanic(ctx).WithName(ControllerName)
@@ -74,9 +74,9 @@ func (r *ManagedControlPlaneReconciler) Reconcile(ctx context.Context, req recon
 	rr := r.reconcile(ctx, req)
 
 	// status update
-	return ctrlutils.NewOpenMCPStatusUpdaterBuilder[*corev2alpha1.ManagedControlPlane]().
+	return ctrlutils.NewOpenMCPStatusUpdaterBuilder[*corev2alpha1.ManagedControlPlaneV2]().
 		WithNestedStruct("Status").
-		WithPhaseUpdateFunc(func(obj *corev2alpha1.ManagedControlPlane, rr ctrlutils.ReconcileResult[*corev2alpha1.ManagedControlPlane]) (string, error) {
+		WithPhaseUpdateFunc(func(obj *corev2alpha1.ManagedControlPlaneV2, rr ctrlutils.ReconcileResult[*corev2alpha1.ManagedControlPlaneV2]) (string, error) {
 			if rr.Object != nil {
 				if !rr.Object.DeletionTimestamp.IsZero() {
 					return commonapi.StatusPhaseTerminating, nil
@@ -97,7 +97,7 @@ func (r *ManagedControlPlaneReconciler) Reconcile(ctx context.Context, req recon
 func (r *ManagedControlPlaneReconciler) reconcile(ctx context.Context, req reconcile.Request) ReconcileResult {
 	log := logging.FromContextOrPanic(ctx)
 	// get ManagedControlPlane resource
-	mcp := &corev2alpha1.ManagedControlPlane{}
+	mcp := &corev2alpha1.ManagedControlPlaneV2{}
 	if err := r.OnboardingCluster.Client().Get(ctx, req.NamespacedName, mcp); err != nil {
 		if apierrors.IsNotFound(err) {
 			log.Info("Resource not found")
@@ -138,12 +138,12 @@ func (r *ManagedControlPlaneReconciler) SetupWithManager(mgr ctrl.Manager) error
 	return ctrl.NewControllerManagedBy(mgr).
 		Named(strings.ToLower(ControllerName)).
 		// watch ManagedControlPlane resources on the Onboarding cluster
-		WatchesRawSource(source.Kind(r.OnboardingCluster.Cluster().GetCache(), &corev2alpha1.ManagedControlPlane{}, handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj *corev2alpha1.ManagedControlPlane) []ctrl.Request {
+		WatchesRawSource(source.Kind(r.OnboardingCluster.Cluster().GetCache(), &corev2alpha1.ManagedControlPlaneV2{}, handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj *corev2alpha1.ManagedControlPlaneV2) []ctrl.Request {
 			if obj == nil {
 				return nil
 			}
 			return []ctrl.Request{testutils.RequestFromObject(obj)}
-		}), ctrlutils.ToTypedPredicate[*corev2alpha1.ManagedControlPlane](predicate.And(
+		}), ctrlutils.ToTypedPredicate[*corev2alpha1.ManagedControlPlaneV2](predicate.And(
 			predicate.Or(
 				predicate.GenerationChangedPredicate{},
 				ctrlutils.DeletionTimestampChangedPredicate{},
@@ -157,7 +157,7 @@ func (r *ManagedControlPlaneReconciler) SetupWithManager(mgr ctrl.Manager) error
 		Complete(r)
 }
 
-func (r *ManagedControlPlaneReconciler) handleCreateOrUpdate(ctx context.Context, mcp *corev2alpha1.ManagedControlPlane) ReconcileResult {
+func (r *ManagedControlPlaneReconciler) handleCreateOrUpdate(ctx context.Context, mcp *corev2alpha1.ManagedControlPlaneV2) ReconcileResult {
 	log := logging.FromContextOrPanic(ctx)
 	log.Info("Handling creation or update of ManagedControlPlane resource")
 
@@ -238,7 +238,7 @@ func (r *ManagedControlPlaneReconciler) handleCreateOrUpdate(ctx context.Context
 	return rr
 }
 
-func (r *ManagedControlPlaneReconciler) handleDelete(ctx context.Context, mcp *corev2alpha1.ManagedControlPlane) ReconcileResult {
+func (r *ManagedControlPlaneReconciler) handleDelete(ctx context.Context, mcp *corev2alpha1.ManagedControlPlaneV2) ReconcileResult {
 	log := logging.FromContextOrPanic(ctx)
 	log.Info("Handling deletion of ManagedControlPlane resource")
 

internal/controllers/managedcontrolplane/controller_test.go

@@ -85,7 +85,7 @@ var _ = Describe("ManagedControlPlane Controller", func() {
 	It("should correctly handle the creation, update, and deletion flow for MCP resources", func() {
 		rec, env := defaultTestSetup("testdata", "test-01")
 
-		mcp := &corev2alpha1.ManagedControlPlane{}
+		mcp := &corev2alpha1.ManagedControlPlaneV2{}
 		mcp.SetName("mcp-01")
 		mcp.SetNamespace("test")
 		Expect(env.Client(onboarding).Get(env.Ctx, client.ObjectKeyFromObject(mcp), mcp)).To(Succeed())

internal/controllers/managedcontrolplane/services.go

@@ -21,7 +21,7 @@ import (
 // deleteDependingServices deletes service resources that belong to service providers which have a 'services.openmcp.cloud/<name>' finalizer on the ManagedControlPlane.
 // It returns a set of service provider names for which still resources exist (should be in deletion by the time this function returns) and the total number of resources that are still left.
 // Deletion of the MCP should wait until the set is empty and the count is zero.
-func (r *ManagedControlPlaneReconciler) deleteDependingServices(ctx context.Context, mcp *corev2alpha1.ManagedControlPlane) (map[string][]*unstructured.Unstructured, errutils.ReasonableError) {
+func (r *ManagedControlPlaneReconciler) deleteDependingServices(ctx context.Context, mcp *corev2alpha1.ManagedControlPlaneV2) (map[string][]*unstructured.Unstructured, errutils.ReasonableError) {
 	log := logging.FromContextOrPanic(ctx)
 
 	// delete depending service resources, if any