Skip to content

馃悰 Restrict ClusterObjectSet retention to the current controller owner #3040

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fgiudici wants to merge 1 commit into from
Closed

馃悰 Restrict ClusterObjectSet retention to the current controller owner #3040

Show file tree
Hide file tree
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
20 changes: 14 additions & 6 deletions internal/operator-controller/applier/boxcutter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ func (bc *Boxcutter) createExternalizedRevision(ctx context.Context, ext *ocv1.C
desiredRevision.WithName(revisionName)
desiredRevision.Spec.WithRevision(revisionNumber)

if err := bc.garbageCollectOldRevisions(ctx, prevRevisions); err != nil {
if err := bc.garbageCollectOldRevisions(ctx, ext, prevRevisions); err != nil {
return fmt.Errorf("garbage collecting old revisions: %w", err)
}

Expand Down Expand Up @@ -628,12 +628,20 @@ func (bc *Boxcutter) createExternalizedRevision(ctx context.Context, ext *ocv1.C
return nil
}

// garbageCollectOldRevisions deletes archived revisions beyond ClusterObjectSetRetentionLimit.
// Active revisions are never deleted. revisionList must be sorted oldest to newest.
func (bc *Boxcutter) garbageCollectOldRevisions(ctx context.Context, revisionList []ocv1.ClusterObjectSet) error {
for index, r := range revisionList {
// garbageCollectOldRevisions deletes archived revisions controlled by owner beyond
// ClusterObjectSetRetentionLimit. Other owners' revisions do not count toward the
// limit. Active and deleting revisions controlled by owner still count, but only
// archived revisions are deleted. revisionList must be sorted oldest to newest.
func (bc *Boxcutter) garbageCollectOldRevisions(ctx context.Context, owner metav1.Object, revisionList []ocv1.ClusterObjectSet) error {
ownedRevisions := make([]ocv1.ClusterObjectSet, 0, len(revisionList))
for i := range revisionList {
if metav1.IsControlledBy(&revisionList[i], owner) {
ownedRevisions = append(ownedRevisions, revisionList[i])
}
}
for index, r := range ownedRevisions {
// Only delete archived revisions that are beyond the limit
if index < len(revisionList)-ClusterObjectSetRetentionLimit && r.Spec.LifecycleState == ocv1.ClusterObjectSetLifecycleStateArchived {
if index < len(ownedRevisions)-ClusterObjectSetRetentionLimit && r.Spec.LifecycleState == ocv1.ClusterObjectSetLifecycleStateArchived {
if err := bc.Client.Delete(ctx, &ocv1.ClusterObjectSet{
ObjectMeta: metav1.ObjectMeta{
Name: r.Name,
Expand Down
Loading
Loading