github/capsule
1
0
Fork 0
mirror of https://github.com/projectcapsule/capsule.git synced 2026-02-14 18:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignoring NotIn requirement during resource pruning (#54)

Browse Source
This commit is contained in:
Dario Tranchitella
2020-08-12 17:16:48 +02:00
committed by GitHub
parent 7661bbb0ad
commit ee469ce2e7
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
controllers/tenant_controller.go
View File

@@ -130,19 +130,28 @@ func (r *TenantReconciler) pruningResources(ns string, keys []string, obj runtim
if err != nil {
return err
}
s := labels.NewSelector()
exists, err := labels.NewRequirement(capsuleLabel, selection.Exists, []string{})
if err != nil {
return err
}
notIn, err := labels.NewRequirement(capsuleLabel, selection.NotIn, keys)
if err != nil {
return err
s = s.Add(*exists)
if len(keys) > 0 {
notIn, err := labels.NewRequirement(capsuleLabel, selection.NotIn, keys)
if err != nil {
return err
}
s = s.Add(*notIn)
}
r.Log.Info("Pruning objects with label selector " + notIn.String())
r.Log.Info("Pruning objects with label selector " + s.String())
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
return r.DeleteAllOf(context.TODO(), obj, &client.DeleteAllOfOptions{
ListOptions: client.ListOptions{
LabelSelector: labels.NewSelector().Add(*exists, *notIn),
LabelSelector: s,
Namespace: ns,
},
DeleteOptions: client.DeleteOptions{},