From 9979e8cf5a6fcd72fd3b7aa3b12e348b4e84009f Mon Sep 17 00:00:00 2001 From: Anton Bretting Date: Sat, 22 Jan 2022 14:17:14 +0100 Subject: [PATCH] Cleanup of three-way-merge Remove generation and deployment.kubernetes.io/revision from diff --- cmd/upgrade.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/upgrade.go b/cmd/upgrade.go index d6b91b72..c403d3c3 100644 --- a/cmd/upgrade.go +++ b/cmd/upgrade.go @@ -555,6 +555,7 @@ func deleteStatusAndTidyMetadata(obj []byte) (map[string]interface{}, error) { metadata := objectMap["metadata"].(map[string]interface{}) delete(metadata, "managedFields") + delete(metadata, "generation") // See the below for the goal of this metadata tidy logic. // https://github.com/databus23/helm-diff/issues/326#issuecomment-1008253274 @@ -562,6 +563,7 @@ func deleteStatusAndTidyMetadata(obj []byte) (map[string]interface{}, error) { annotations := a.(map[string]interface{}) delete(annotations, "meta.helm.sh/release-name") delete(annotations, "meta.helm.sh/release-namespace") + delete(annotations, "deployment.kubernetes.io/revision") if len(annotations) == 0 { delete(metadata, "annotations")