From cd3577db532cfce69898474982dc27304de35d7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 16:00:44 +0800 Subject: [PATCH] Fix: skip last-applied-configuration error for threewaymergepatch (#5405) Signed-off-by: Somefive (cherry picked from commit 6bf79461d4a73fcc9c561da20ff2cd8ad5f0147d) Co-authored-by: Somefive --- pkg/utils/apply/patch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/utils/apply/patch.go b/pkg/utils/apply/patch.go index dc2f0eb6e..4fc074d94 100644 --- a/pkg/utils/apply/patch.go +++ b/pkg/utils/apply/patch.go @@ -164,7 +164,7 @@ func getOriginalConfiguration(obj runtime.Object) ([]byte, error) { return nil, nil } original, ok := annots[oam.AnnotationLastAppliedConfig] - if !ok { + if !ok || original == "-" || original == "skip" { return nil, nil } return []byte(original), nil