fixup! ASOAPI: add resource mutator framework

kubernetes-sigs · May 1, 2024 · 09c01b7 · 09c01b7
1 parent bbc4d0c
commit 09c01b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/exp/controllers/azureasomanagedcluster_controller.go b/exp/controllers/azureasomanagedcluster_controller.go
@@ -227,7 +227,7 @@ func (r *AzureASOManagedClusterReconciler) reconcileNormal(ctx context.Context,
 		return ctrl.Result{Requeue: true}, nil
 	}
 
-	resources, err := mutators.ApplyMutators(ctx, asoManagedCluster.Spec.Resources)
+	resources, err := mutators.ToUnstructured(ctx, asoManagedCluster.Spec.Resources)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -279,7 +279,7 @@ func (r *AzureASOManagedClusterReconciler) reconcileDelete(ctx context.Context,
 	defer done()
 	log.V(4).Info("reconciling delete")
 
-	resources, err := mutators.ApplyMutators(ctx, asoManagedCluster.Spec.Resources)
+	resources, err := mutators.ToUnstructured(ctx, asoManagedCluster.Spec.Resources)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

diff --git a/exp/controllers/azureasomanagedcontrolplane_controller.go b/exp/controllers/azureasomanagedcontrolplane_controller.go
@@ -296,7 +296,7 @@ func (r *AzureASOManagedControlPlaneReconciler) reconcileDelete(ctx context.Cont
 	defer done()
 	log.V(4).Info("reconciling delete")
 
-	resources, err := mutators.ApplyMutators(ctx, asoManagedControlPlane.Spec.Resources)
+	resources, err := mutators.ToUnstructured(ctx, asoManagedControlPlane.Spec.Resources)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

diff --git a/exp/controllers/azureasomanagedmachinepool_controller.go b/exp/controllers/azureasomanagedmachinepool_controller.go
@@ -312,7 +312,7 @@ func (r *AzureASOManagedMachinePoolReconciler) reconcileDelete(ctx context.Conte
 	// If the entire cluster is being deleted, this ASO ManagedClustersAgentPool will be deleted with the rest
 	// of the ManagedCluster.
 	if cluster.DeletionTimestamp.IsZero() {
-		resources, err := mutators.ApplyMutators(ctx, asoManagedMachinePool.Spec.Resources)
+		resources, err := mutators.ToUnstructured(ctx, asoManagedMachinePool.Spec.Resources)
 		if err != nil {
 			return ctrl.Result{}, err
 		}

diff --git a/exp/mutators/mutator.go b/exp/mutators/mutator.go
@@ -74,3 +74,8 @@ func ApplyMutators(ctx context.Context, resources []runtime.RawExtension, mutato
 	}
 	return us, nil
 }
+
+// ToUnstructured converts the given resources to Unstructured.
+func ToUnstructured(ctx context.Context, resources []runtime.RawExtension) ([]*unstructured.Unstructured, error) {
+	return ApplyMutators(ctx, resources)
+}