Skip to content

Commit

Permalink
Document SMP behavior for custom resources
Browse files Browse the repository at this point in the history
Documents how strategic merge patches are treated as json merge patches
when dealing with custom resources.
  • Loading branch information
rndstr committed Jan 30, 2019
1 parent b6d4101 commit f550540
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions docs/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit f550540

Please sign in to comment.