summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pelisse <apelisse@google.com>2021-04-13 20:50:50 -0700
committerGitHub <noreply@github.com>2021-04-13 20:50:50 -0700
commit869fcbb2be18a6720881a03a4ac489d1656b92b1 (patch)
tree025a8f6d0c723769ef5fff86b2d38a52cab62f1b
parentd336524edb8715f419276d0d1b845a1f25492f54 (diff)
Warn that SMP is somewhat obsolete
-rw-r--r--contributors/devel/sig-api-machinery/strategic-merge-patch.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/contributors/devel/sig-api-machinery/strategic-merge-patch.md b/contributors/devel/sig-api-machinery/strategic-merge-patch.md
index 812a4a8c..1b986781 100644
--- a/contributors/devel/sig-api-machinery/strategic-merge-patch.md
+++ b/contributors/devel/sig-api-machinery/strategic-merge-patch.md
@@ -1,6 +1,13 @@
Strategic Merge Patch
=====================
+# Disclaimer
+
+This document is old and probably obsolete.
+[Server-side Apply](https://kubernetes.io/docs/reference/using-api/server-side-apply/)
+is the new solution and is the recommended way to go. It doesn't require
+any client-side logic.
+
# Background
Kubernetes supports a customized version of JSON merge patch called strategic merge patch. This