Safeguard unnecessary DS cleanup (#2242)

* Attempt to fix spurrious DS cleanups

* don't return from profilesToApply on DAP status update (#2240)

* don't return from profilesToApply on DAP status update

* add/remove some logging,log uuid

* cleanup

* remove one more log line

* revert datadogagentinternal controller change

---------

Co-authored-by: Timothée Bavelier <timothee.bavelier@datadoghq.com>

Author: levan-m

internal/controller/datadogagent/controller_reconcile_agent.go

@@ -420,7 +420,24 @@ func (r *Reconciler) cleanupExtraneousDaemonSets(ctx context.Context, logger log
 	}
 
 	dsName := component.GetDaemonSetNameFromDatadogAgent(dda, &dda.Spec)
+
 	validDaemonSetNames, validExtendedDaemonSetNames := r.getValidDaemonSetNames(dsName, providerList, profiles, useV3Metadata(dda))
+	// log computed valid names for debugging
+	vd := make([]string, 0, len(validDaemonSetNames))
+	for n := range validDaemonSetNames {
+		vd = append(vd, n)
+	}
+	veds := make([]string, 0, len(validExtendedDaemonSetNames))
+	for n := range validExtendedDaemonSetNames {
+		veds = append(veds, n)
+	}
+
+	// Safety guard: if no valid names could be computed, skip cleanup to avoid
+	// deleting all DaemonSets during transient cache hiccups (e.g., empty provider list).
+	if len(validDaemonSetNames) == 0 && len(validExtendedDaemonSetNames) == 0 {
+		logger.Info("Skipping cleanup of DaemonSets: no valid names computed", "providersLen", len(providerList), "profilesLen", len(profiles))
+		return nil
+	}
 
 	// Only the default profile uses an EDS when profiles are enabled
 	// Multiple EDSs can be created with introspection
@@ -429,9 +446,10 @@ func (r *Reconciler) cleanupExtraneousDaemonSets(ctx context.Context, logger log
 		if err := r.client.List(ctx, &edsList, matchLabels); err != nil {
 			return err
 		}
-
+		logger.V(1).Info("Listed ExtendedDaemonSets for cleanup", "count", len(edsList.Items))
 		for _, eds := range edsList.Items {
 			if _, ok := validExtendedDaemonSetNames[eds.Name]; !ok {
+				logger.Info("Candidate ExtendedDaemonSet deletion", "name", eds.Name)
 				if err := r.deleteV2ExtendedDaemonSet(logger, dda, &eds, newStatus); err != nil {
 					return err
 				}
@@ -444,8 +462,10 @@ func (r *Reconciler) cleanupExtraneousDaemonSets(ctx context.Context, logger log
 		return err
 	}
 
+	logger.V(1).Info("Listed DaemonSets for cleanup", "count", len(daemonSetList.Items))
 	for _, daemonSet := range daemonSetList.Items {
 		if _, ok := validDaemonSetNames[daemonSet.Name]; !ok {
+			logger.Info("Candidate DaemonSet deletion", "name", daemonSet.Name)
 			if err := r.deleteV2DaemonSet(logger, dda, &daemonSet, newStatus); err != nil {
 				return err
 			}

internal/controller/datadogagent/controller_reconcile_v2.go

@@ -322,7 +322,7 @@ func (r *Reconciler) profilesToApply(ctx context.Context, logger logr.Logger, no
 	profilesList := datadoghqv1alpha1.DatadogAgentProfileList{}
 	err := r.client.List(ctx, &profilesList)
 	if err != nil {
-		return nil, nil, err
+		logger.Info("unable to list DatadogAgentProfiles", "error", err)
 	}
 
 	var profileListToApply []datadoghqv1alpha1.DatadogAgentProfile
@@ -334,7 +334,7 @@ func (r *Reconciler) profilesToApply(ctx context.Context, logger logr.Logger, no
 		oldStatus := profile.Status
 		profileAppliedByNode, err = agentprofile.ApplyProfile(logger, &profile, nodeList, profileAppliedByNode, now, maxUnavailable, r.options.DatadogAgentInternalEnabled)
 		if result, e := r.updateDAPStatus(ctx, logger, &profile, &oldStatus); utils.ShouldReturn(result, e) {
-			return nil, nil, e
+			logger.Info("unable to update DatadogAgentProfile status", "error", e, "requeue", result.Requeue, "requeueAfter", result.RequeueAfter)
 		}
 		if err != nil {
 			// profile is invalid or conflicts