Skip to content

fix: Disable pruning during reconciliation when objectSelector is used #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1
Open

fix: Disable pruning during reconciliation when objectSelector is used #409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion controllers/configurationpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,9 @@

// cleanUpChildObjects conditionally removed child objects that are no longer referenced in the
// `newRelated` list, compared to what is currently in the policy. It does not delete anything in
// inform mode, and it obeys the pruneObjectBehavior setting.
// inform mode, and it obeys the pruneObjectBehavior setting. During normal reconciliation, cleanup
// is skipped when any object template uses objectSelector to prevent deletion of objects that stop
// matching the selector after being updated. Cleanup still occurs when the policy itself is deleted.
func (r *ConfigurationPolicyReconciler) cleanUpChildObjects(
plc *policyv1.ConfigurationPolicy, newRelated []policyv1.RelatedObject, usingWatch bool,
) []string {
Expand Down Expand Up @@ -1029,6 +1031,13 @@
var skipCleanupChildObjects bool

for index, objectT := range plc.Spec.ObjectTemplates {
// Check if any object template uses objectSelector - pruning should be disabled during
// normal reconciliation to prevent deletion of objects that stop matching the selector
if !skipCleanupChildObjects && objectT.ObjectSelector != nil {
skipCleanupChildObjects = true
log.V(2).Info("Disabling object cleanup during reconciliation because objectSelector is in use")

Check failure on line 1038 in controllers/configurationpolicy_controller.go

View workflow job for this annotation

GitHub Actions / Preflight Tests 

only cuddled expressions if assigning variable or using from line above (wsl)
}

nsNameToResults := map[string]objectTmplEvalResult{}

var resolverToUse *templates.TemplateResolver
Expand Down
Loading