Skip to content

Don't override RV when listing in Replication VW #3689

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

Merged
merged 2 commits into from
Nov 6, 2025
Merged

Don't override RV when listing in Replication VW #3689

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd0fc3
Don't override RV when listing in Replication VW
gman0 Oct 28, 2025
69c35f2
unwrappingWatch should check against real inner obj RV
gman0 Oct 30, 2025
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
23 changes: 11 additions & 12 deletions pkg/virtual/replication/builder/unwrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,17 +331,6 @@ func newUnwrappingWatch(
Handler: clientgocache.ResourceEventHandlerDetailedFuncs{
AddFunc: func(obj interface{}, isInInitialList bool) {
cachedObj := tombstone.Obj[*cachev1alpha1.CachedObject](obj)
if isInInitialList {
if cachedObj.GetResourceVersion() <= innerListOpts.ResourceVersion {
// This resource is older than the want we want to start from on isInInitial list replay.
return
}
if innerListOpts.SendInitialEvents != nil && !*innerListOpts.SendInitialEvents {
// The user explicitly requests not to send the initial list.
return
}
}

innerObj, err := unwrapWithMatchingSelectors(cachedObj)
if err != nil {
w.safeWrite(watch.Event{
Expand All @@ -355,6 +344,17 @@ func newUnwrappingWatch(
return
}

if isInInitialList {
if innerObj.GetResourceVersion() <= innerListOpts.ResourceVersion {
// This resource is older than the one we want to start from on isInInitial list replay.
return
}
if innerListOpts.SendInitialEvents != nil && !*innerListOpts.SendInitialEvents {
// The user explicitly requests not to send the initial list.
return
}
}

for _, cluster := range syntheticClusters() {
obj := innerObj.DeepCopy()
setCluster(obj, cluster)
Expand Down Expand Up @@ -499,7 +499,6 @@ func newUnwrappingList(innerListGVK schema.GroupVersionKind, innerObjGR schema.G
continue
}

innerObj.SetResourceVersion(item.GetResourceVersion())
for _, cluster := range clusters {
obj := innerObj.DeepCopy()
setCluster(obj, cluster)
Expand Down