fix(gitops-engine): apply HideSecretData to server-side diff results for Secrets#27598
Merged
agaudreault merged 19 commits intoargoproj:masterfrom Apr 30, 2026
Merged
Conversation
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: downfa11 <downfa11@naver.com>
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #27598 +/- ##
==========================================
- Coverage 63.65% 63.59% -0.07%
==========================================
Files 417 417
Lines 57079 57134 +55
==========================================
Hits 36336 36336
- Misses 17353 17402 +49
- Partials 3390 3396 +6 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
Signed-off-by: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com>
agaudreault
reviewed
Apr 30, 2026
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #25260
Summary
Fixes Secret resources showing persistent OutOfSync status when using IncludeMutationWebhook=true with mutation webhooks.
Problem
After sync, the live Secret already contains the webhook-mutated value. On the next server-side diff, Argo CD performs dry-run SSA, which also runs the webhook and produces predictedLive. Logically, predictedLive should match live. But for core Secrets, the webhook-mutated data can differ at the raw comparison level between the dry-run result and the actual live object. Argo CD compares those bytes and marks the resource OutOfSync.
Solution
Use HideSecretData during ServerSideDiff to ensure after mutating webhook modifies secret that data is symmetrical before comparison if secret values are identical
Checklist: