Skip to content

fix(diff): improve server-side diff detection for custom resources #23128

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

Closed
sujay2306 wants to merge 2 commits into from
Closed

fix(diff): improve server-side diff detection for custom resources #23128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ff351
added code changes
May 23, 2025
6c07f10
fix(diff): improve server-side diff detection for custom resources
May 23, 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
22 changes: 17 additions & 5 deletions util/argo/diff/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,12 +364,23 @@ func diffArrayCached(configArray []*unstructured.Unstructured, liveArray []*unst
} else {
key = kube.GetResourceKey(config)
}

// Always calculate diff for custom resources to ensure field-level changes are detected
isCustomResource := config != nil && live != nil && config.GetAPIVersion() != live.GetAPIVersion()
var dr *diff.DiffResult
if cachedDiff, ok := diffByKey[key]; ok && cachedDiff.ResourceVersion == resourceVersion {
dr = &diff.DiffResult{
NormalizedLive: []byte(cachedDiff.NormalizedLiveState),
PredictedLive: []byte(cachedDiff.PredictedLiveState),
Modified: cachedDiff.Modified,
if !isCustomResource {
if cachedItem, ok := diffByKey[key]; ok && cachedItem.ResourceVersion == resourceVersion {
dr = &diff.DiffResult{
NormalizedLive: []byte(cachedItem.NormalizedLiveState),
PredictedLive: []byte(cachedItem.PredictedLiveState),
Modified: cachedItem.Modified,
}
} else {
res, err := diff.Diff(configArray[i], liveArray[i], opts...)
if err != nil {
return nil, err
}
dr = res
}
} else {
res, err := diff.Diff(configArray[i], liveArray[i], opts...)
Expand All @@ -378,6 +389,7 @@ func diffArrayCached(configArray []*unstructured.Unstructured, liveArray []*unst
}
dr = res
}

if dr != nil {
diffResultList.Diffs[i] = *dr
if dr.Modified {
Expand Down
Loading