Merge branch 'gh/fix-nodeset-reconcilation' into 'main'

Fix NodeSet Reconciliation

See merge request SchedMD/slinky-dev/slurm-operator!380

Author: SkylerMalinowski

internal/controller/nodeset/nodeset_sync.go

@@ -578,6 +578,9 @@ func (r *NodeSetReconciler) syncSlurmDeadline(
 			toUpdate.Annotations[slinkyv1beta1.AnnotationPodDeadline] = deadline.Format(time.RFC3339)
 		}
 		if err := r.Patch(ctx, toUpdate, client.StrategicMergeFrom(pod)); err != nil {
+			if apierrors.IsNotFound(err) {
+				return nil
+			}
 			return err
 		}
 
@@ -620,6 +623,9 @@ func (r *NodeSetReconciler) syncSlurmTopology(
 		toUpdate := pod.DeepCopy()
 		toUpdate.Annotations[slinkyv1beta1.AnnotationNodeTopologySpec] = topologyLine
 		if err := r.Patch(ctx, toUpdate, client.StrategicMergeFrom(pod)); err != nil {
+			if apierrors.IsNotFound(err) {
+				return nil
+			}
 			logger.Error(err, "failed to patch pod annotations", "pod", klog.KObj(pod))
 			return err
 		}

internal/controller/nodeset/nodeset_sync_status.go

@@ -334,7 +334,7 @@ func (r *NodeSetReconciler) updateNodeSetPodPDBLabels(
 			logger.Error(err, "failed to patch pod labels for PDB", "pod", klog.KObj(toUpdate))
 			return err
 		}
-		return r.Patch(ctx, toUpdate, client.StrategicMergeFrom(pod))
+		return nil
 	}
 	if _, err := utils.SlowStartBatch(len(pods), utils.SlowStartInitialBatchSize, syncPodPDBLabelsFn); err != nil {
 		return err