From a38bbc72cff4dfb07bf5b3cbb72b1e2344ea7ce3 Mon Sep 17 00:00:00 2001
From: Somefive <yd219913@alibaba-inc.com>
Date: Wed, 1 Feb 2023 15:58:57 +0800
Subject: [PATCH] Fix: skip last-applied-configuration error for
 threewaymergepatch (#5402)

Signed-off-by: Somefive <yd219913@alibaba-inc.com>
---
 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