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

fixed an issue for generic sync that deleted referenced objects #2150

Merged
merged 1 commit into from
Sep 17, 2024
Merged

fixed an issue for generic sync that deleted referenced objects #2150

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
14 changes: 8 additions & 6 deletions pkg/syncer/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,15 @@ func (r *SyncController) Reconcile(ctx context.Context, origReq ctrl.Request) (_
// make sure the object uid matches
pAnnotations := pObj.GetAnnotations()
if !r.options.DisableUIDDeletion && pAnnotations[translate.UIDAnnotation] != "" && pAnnotations[translate.UIDAnnotation] != string(vObj.GetUID()) {
// requeue if object is already being deleted
if pObj.GetDeletionTimestamp() != nil {
return ctrl.Result{RequeueAfter: time.Second}, nil
if pAnnotations[translate.KindAnnotation] == "" || pAnnotations[translate.KindAnnotation] == r.syncer.GroupVersionKind().String() {
// requeue if object is already being deleted
if pObj.GetDeletionTimestamp() != nil {
return ctrl.Result{RequeueAfter: time.Second}, nil
}

// delete physical object
return DeleteHostObject(syncContext, pObj, "virtual object uid is different")
}

// delete physical object
return DeleteHostObject(syncContext, pObj, "virtual object uid is different")
}

return r.genericSyncer.Sync(syncContext, &synccontext.SyncEvent[client.Object]{
Expand Down
Loading