From f550540318f4584fbe01e2e0da9ceb9b62035e22 Mon Sep 17 00:00:00 2001 From: Roli Schilter Date: Wed, 30 Jan 2019 12:25:05 -0800 Subject: [PATCH] Document SMP behavior for custom resources Documents how strategic merge patches are treated as json merge patches when dealing with custom resources. --- docs/glossary.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/glossary.md b/docs/glossary.md index 4fca944dbe..7c5c7c9893 100644 --- a/docs/glossary.md +++ b/docs/glossary.md @@ -5,6 +5,7 @@ [Declarative Application Management]: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/architecture/declarative-application-management.md [JSON]: https://www.json.org/ [JSONPatch]: https://tools.ietf.org/html/rfc6902 +[JSONMergePatch]: https://tools.ietf.org/html/rfc7386 [Resource]: #resource [YAML]: http://www.yaml.org/start.html [application]: #application @@ -298,6 +299,9 @@ directives include _replace_ (the default), _merge_ (avoid replacing a list), _delete_ and a few more (see [these notes][strategic-merge]). +Note that for custom resources, SMPs are treated as +[json merge patches][JSONMergePatch]. + Fun fact - any resource file can be used as an SMP, overwriting matching fields in another resource with the same group/version/kind/name,