Skip to content

Commit 0654e8a

Browse files
committed
updated deviation orphan handling
1 parent 7c42594 commit 0654e8a

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

pkg/transactor/transactor.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,9 @@ func getConfigsAndDeviationsToTransact(
539539

540540
case cfg.GetDeletionTimestamp() != nil:
541541
if !cfg.IsRevertive() {
542+
labels := safeCopyLabels(deviation.GetLabels())
543+
labels["orphan"] = strconv.FormatBool(cfg.Orphan())
544+
deviation.SetLabels(labels)
542545
deviationsToDelete[key] = deviation
543546
deviationsToDeleteSet.Insert(key)
544547
}
@@ -562,12 +565,17 @@ func getConfigsAndDeviationsToTransact(
562565
deviationsToUpdate[key] = deviation
563566
deviationsToUpdateSet.Insert(key)
564567
} else {
568+
labels := safeCopyLabels(deviation.GetLabels())
569+
labels["orphan"] = strconv.FormatBool(cfg.Orphan())
570+
deviation.SetLabels(labels)
565571
deviationsToDelete[key] = deviation
566572
deviationsToDeleteSet.Insert(key)
567573
}
568574

569575
}
570576
if len(deviation.Spec.Deviations) == 0 {
577+
labels := safeCopyLabels(deviation.GetLabels())
578+
labels["orphan"] = strconv.FormatBool(cfg.Orphan())
571579
deviationsToDelete[key] = deviation
572580
deviationsToDeleteSet.Insert(key)
573581
}
@@ -594,10 +602,16 @@ func getConfigsAndDeviationsToTransact(
594602
deviationsToUpdate[key] = deviation
595603
deviationsToUpdateSet.Insert(key)
596604
} else {
605+
labels := safeCopyLabels(deviation.GetLabels())
606+
labels["orphan"] = strconv.FormatBool(cfg.Orphan())
607+
deviation.SetLabels(labels)
597608
deviationsToDelete[key] = deviation
598609
deviationsToDeleteSet.Insert(key)
599610
}
600611
} else {
612+
labels := safeCopyLabels(deviation.GetLabels())
613+
labels["orphan"] = strconv.FormatBool(cfg.Orphan())
614+
deviation.SetLabels(labels)
601615
deviationsToDelete[key] = deviation
602616
deviationsToDeleteSet.Insert(key)
603617
}
@@ -612,6 +626,9 @@ func getConfigsAndDeviationsToTransact(
612626
}
613627

614628
if !cfg.IsRevertive() {
629+
labels := safeCopyLabels(deviation.GetLabels())
630+
labels["orphan"] = strconv.FormatBool(cfg.Orphan())
631+
deviation.SetLabels(labels)
615632
deviationsToDelete[key] = deviation
616633
deviationsToDeleteSet.Insert(key)
617634
}

0 commit comments

Comments
 (0)