Skip to content
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

Add check for owner references in backup sync, removing if missing #7032

Merged
merged 3 commits into from
Nov 17, 2023
Merged

Add check for owner references in backup sync, removing if missing #7032

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
929af4f
Add check for owner reference in backup sync, removing if missing
Oct 30, 2023
8eec686
Check only schedules, and verify UIDs are the same
Nov 1, 2023
292aa34
move filtering code to seperate method, add tests
Nov 16, 2023
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
1 change: 1 addition & 0 deletions changelogs/unreleased/7031-deefdragon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix #7031. Added check for Owner References when synchronizing backups, removing references that are not found.
22 changes: 22 additions & 0 deletions pkg/controller/backup_sync_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/controller-runtime/pkg/builder"

Expand Down Expand Up @@ -171,6 +172,27 @@
}
backup.Labels[velerov1api.StorageLocationLabel] = label.GetValidName(backup.Spec.StorageLocation)

//check for the backup schedule. If it does not exist, remove it.
listedReferences := backup.ObjectMeta.OwnerReferences
foundReferences := make([]metav1.OwnerReference, 0)
deefdragon marked this conversation as resolved.
Show resolved Hide resolved
for _, v := range listedReferences {
schedule := new(velerov1api.Schedule)
deefdragon marked this conversation as resolved.
Show resolved Hide resolved
err := b.client.Get(ctx, types.NamespacedName{
Name: v.Name,
Namespace: backup.Namespace,
}, schedule)
switch {
case err != nil && apierrors.IsNotFound(err):
log.Debug("Removing missing schedule ownership reference from backup")
case err != nil && !apierrors.IsNotFound(err):
log.WithError(errors.WithStack(err)).Error("Error finding ownership reference schedule")
fallthrough
default:
foundReferences = append(foundReferences, v)

Check warning on line 191 in pkg/controller/backup_sync_controller.go

View check run for this annotation

Codecov / codecov/patch

pkg/controller/backup_sync_controller.go#L179-L191 

Added lines #L179 - L191 were not covered by tests
}
}
backup.ObjectMeta.OwnerReferences = foundReferences

// attempt to create backup custom resource via API
err = b.client.Create(ctx, backup, &client.CreateOptions{})
switch {
Expand Down
Loading