Merge pull request #1012 from fluxcd/backport-1010-to-release/v1.0.x

[release/v1.0.x] Re-enable logging json patch on StatusDrifted
fluxcd · Jun 19, 2024 · aff5e2b · aff5e2b
2 parents 8404164 + 8ad741a
commit aff5e2b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/internal/reconcile/atomic_release.go b/internal/reconcile/atomic_release.go
@@ -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)
 			}
 		}