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.

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

[release/v1.0.x] Re-enable logging json patch on StatusDrifted #1012

Merged
merged 1 commit into from
Jun 19, 2024
Merged
Changes from all commits
Commits
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
Re-enable logging json patch on StatusDrifted
Signed-off-by: Soule BA <bah.soule@gmail.com>
(cherry picked from commit a3c4b4d)
  • Loading branch information
souleb authored and github-actions[bot] committed Jun 19, 2024
commit 8ad741a6fde66fac0b31ff5f727b64e774c38f43
7 changes: 6 additions & 1 deletion internal/reconcile/atomic_release.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,13 @@ func (r *AtomicRelease) actionForState(ctx context.Context, req *Request, state
log.V(logger.DebugLevel).Info("resource deleted",
"resource", diff.ResourceName(change.DesiredObject))
case jsondiff.DiffTypeUpdate:
patch := change.Patch
if change.DesiredObject.GetObjectKind().GroupVersionKind().Kind == "Secret" {
patch = jsondiff.MaskSecretPatchData(change.Patch)
}
log.V(logger.DebugLevel).Info("resource modified",
"resource", diff.ResourceName(change.DesiredObject))
"resource", diff.ResourceName(change.DesiredObject),
"patch", patch)
}
}

Expand Down