Acknowledge all ASO resource types before creating

Author: nojnhuh

api/v1alpha1/azureasomanagedcluster_types.go

@@ -79,11 +79,6 @@ type AzureASOManagedCluster struct {
 	Status AzureASOManagedClusterStatus `json:"status,omitempty"`
 }
 
-// GetResourceStatuses returns the status of resources.
-func (a *AzureASOManagedCluster) GetResourceStatuses() []ResourceStatus {
-	return a.Status.Resources
-}
-
 // SetResourceStatuses sets the status of resources.
 func (a *AzureASOManagedCluster) SetResourceStatuses(r []ResourceStatus) {
 	a.Status.Resources = r

api/v1alpha1/azureasomanagedcontrolplane_types.go

@@ -67,11 +67,6 @@ type AzureASOManagedControlPlane struct {
 	Status AzureASOManagedControlPlaneStatus `json:"status,omitempty"`
 }
 
-// GetResourceStatuses returns the status of resources.
-func (a *AzureASOManagedControlPlane) GetResourceStatuses() []ResourceStatus {
-	return a.Status.Resources
-}
-
 // SetResourceStatuses sets the status of resources.
 func (a *AzureASOManagedControlPlane) SetResourceStatuses(r []ResourceStatus) {
 	a.Status.Resources = r

api/v1alpha1/azureasomanagedmachinepool_types.go

@@ -62,11 +62,6 @@ type AzureASOManagedMachinePool struct {
 	Status AzureASOManagedMachinePoolStatus `json:"status,omitempty"`
 }
 
-// GetResourceStatuses returns the status of resources.
-func (a *AzureASOManagedMachinePool) GetResourceStatuses() []ResourceStatus {
-	return a.Status.Resources
-}
-
 // SetResourceStatuses sets the status of resources.
 func (a *AzureASOManagedMachinePool) SetResourceStatuses(r []ResourceStatus) {
 	a.Status.Resources = r

controllers/azureasomanagedcluster_controller.go

@@ -300,19 +300,15 @@ func (r *AzureASOManagedClusterReconciler) reconcileDelete(ctx context.Context,
 	defer done()
 	log.V(4).Info("reconciling delete")
 
-	resources, err := mutators.ToUnstructured(ctx, asoManagedCluster.Spec.Resources)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-	resourceReconciler := r.newResourceReconciler(asoManagedCluster, resources)
-	err = resourceReconciler.Delete(ctx)
+	resourceReconciler := r.newResourceReconciler(asoManagedCluster, nil)
+	err := resourceReconciler.Delete(ctx)
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("failed to reconcile resources: %w", err)
 	}
-	if len(asoManagedCluster.Status.Resources) > 0 {
-		return ctrl.Result{}, nil
+
+	if len(asoManagedCluster.Status.Resources) == 0 {
+		controllerutil.RemoveFinalizer(asoManagedCluster, clusterv1.ClusterFinalizer)
 	}
 
-	controllerutil.RemoveFinalizer(asoManagedCluster, clusterv1.ClusterFinalizer)
 	return ctrl.Result{}, nil
 }

controllers/azureasomanagedcontrolplane_controller.go

@@ -379,20 +379,16 @@ func (r *AzureASOManagedControlPlaneReconciler) reconcileDelete(ctx context.Cont
 	defer done()
 	log.V(4).Info("reconciling delete")
 
-	resources, err := mutators.ToUnstructured(ctx, asoManagedControlPlane.Spec.Resources)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-	resourceReconciler := r.newResourceReconciler(asoManagedControlPlane, resources)
-	err = resourceReconciler.Delete(ctx)
+	resourceReconciler := r.newResourceReconciler(asoManagedControlPlane, nil)
+	err := resourceReconciler.Delete(ctx)
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("failed to reconcile resources: %w", err)
 	}
-	if len(asoManagedControlPlane.Status.Resources) > 0 {
-		return ctrl.Result{}, nil
+
+	if len(asoManagedControlPlane.Status.Resources) == 0 {
+		controllerutil.RemoveFinalizer(asoManagedControlPlane, infrav1.AzureASOManagedControlPlaneFinalizer)
 	}
 
-	controllerutil.RemoveFinalizer(asoManagedControlPlane, infrav1.AzureASOManagedControlPlaneFinalizer)
 	return ctrl.Result{}, nil
 }
 

controllers/azureasomanagedcontrolplane_controller_test.go

@@ -435,7 +435,10 @@ func TestAzureASOManagedControlPlaneReconcile(t *testing.T) {
 			Client: &FakeClient{
 				Client: c,
 				patchFunc: func(_ context.Context, obj client.Object, _ client.Patch, _ ...client.PatchOption) error {
-					kubeconfigSecret := obj.(*corev1.Secret)
+					kubeconfigSecret, ok := obj.(*corev1.Secret)
+					if !ok {
+						return nil
+					}
 					g.Expect(kubeconfigSecret.Data[secret.KubeconfigDataName]).NotTo(BeEmpty())
 					kubeConfigPatched = true
 
@@ -571,7 +574,10 @@ func TestAzureASOManagedControlPlaneReconcile(t *testing.T) {
 			Client: &FakeClient{
 				Client: c,
 				patchFunc: func(_ context.Context, obj client.Object, _ client.Patch, _ ...client.PatchOption) error {
-					kubeconfigSecret := obj.(*corev1.Secret)
+					kubeconfigSecret, ok := obj.(*corev1.Secret)
+					if !ok {
+						return nil
+					}
 					g.Expect(kubeconfigSecret.Data[secret.KubeconfigDataName]).NotTo(BeEmpty())
 					kubeConfigPatched = true
 

controllers/azureasomanagedmachinepool_controller.go

@@ -333,12 +333,8 @@ 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.ToUnstructured(ctx, asoManagedMachinePool.Spec.Resources)
-		if err != nil {
-			return ctrl.Result{}, err
-		}
-		resourceReconciler := r.newResourceReconciler(asoManagedMachinePool, resources)
-		err = resourceReconciler.Delete(ctx)
+		resourceReconciler := r.newResourceReconciler(asoManagedMachinePool, nil)
+		err := resourceReconciler.Delete(ctx)
 		if err != nil {
 			return ctrl.Result{}, fmt.Errorf("failed to reconcile resources: %w", err)
 		}