Fix: skip last-applied-configuration error for threewaymergepatch (#5402)

Signed-off-by: Somefive <yd219913@alibaba-inc.com>
2026-08-18 03:56:36 +00:00 · 2023-02-01 15:58:57 +08:00
parent 17bff50005
commit a38bbc72cf
1 changed files with 1 additions and 1 deletions
@@ -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