Merge pull request kubernetes-sigs#10939 from sbueringer/pr-improve-m…

…p-unit-tests 🌱 Improve MP unit test coverage
sbueringer · Jul 25, 2024 · d36541f · d36541f
2 parents c5b4e93 + 7f8410a
commit d36541f
Show file tree

Hide file tree

Showing 3 changed files with 188 additions and 86 deletions.
diff --git a/exp/internal/controllers/machinepool_controller.go b/exp/internal/controllers/machinepool_controller.go
@@ -302,10 +302,6 @@ func (r *MachinePoolReconciler) reconcileDeleteNodes(ctx context.Context, cluste
 		return nil
 	}
 
-	if r.Tracker == nil {
-		return errors.New("Cannot establish cluster client to delete nodes")
-	}
-
 	clusterClient, err := r.Tracker.GetClient(ctx, util.ObjectKey(cluster))
 	if err != nil {
 		return err
@@ -328,13 +324,9 @@ func (r *MachinePoolReconciler) isMachinePoolNodeDeleteTimeoutPassed(machinePool
 // reconcileDeleteExternal tries to delete external references, returning true if it cannot find any.
 func (r *MachinePoolReconciler) reconcileDeleteExternal(ctx context.Context, machinePool *expv1.MachinePool) (bool, error) {
 	objects := []*unstructured.Unstructured{}
-	references := []*corev1.ObjectReference{}
-	// check for external ref
-	if machinePool.Spec.Template.Spec.Bootstrap.ConfigRef != nil {
-		references = append(references, machinePool.Spec.Template.Spec.Bootstrap.ConfigRef)
-	}
-	if machinePool.Spec.Template.Spec.InfrastructureRef != (corev1.ObjectReference{}) {
-		references = append(references, &machinePool.Spec.Template.Spec.InfrastructureRef)
+	references := []*corev1.ObjectReference{
+		machinePool.Spec.Template.Spec.Bootstrap.ConfigRef,
+		&machinePool.Spec.Template.Spec.InfrastructureRef,
 	}
 
 	// Loop over the references and try to retrieve it with the client.
@@ -374,11 +366,6 @@ func (r *MachinePoolReconciler) watchClusterNodes(ctx context.Context, cluster *
 		return nil
 	}
 
-	// If there is no tracker, don't watch remote nodes
-	if r.Tracker == nil {
-		return nil
-	}
-
 	return r.Tracker.Watch(ctx, remote.WatchInput{
 		Name:         "machinepool-watchNodes",
 		Cluster:      util.ObjectKey(cluster),

diff --git a/exp/internal/controllers/machinepool_controller_noderef.go b/exp/internal/controllers/machinepool_controller_noderef.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -153,7 +154,7 @@ func (r *MachinePoolReconciler) deleteRetiredNodes(ctx context.Context, c client
 		delete(nodeRefsMap, providerID)
 	}
 	for _, node := range nodeRefsMap {
-		if err := c.Delete(ctx, node); err != nil {
+		if err := c.Delete(ctx, node); err != nil && !apierrors.IsNotFound(err) {
 			return errors.Wrapf(err, "failed to delete Node")
 		}
 	}