From b5f71cfe61747e8998a34cb4cedb4242f2d66ff6 Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Tue, 26 Dec 2017 16:04:31 +0530 Subject: smp: OpenAPI annotations are now allowed --- contributors/devel/strategic-merge-patch.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contributors/devel/strategic-merge-patch.md b/contributors/devel/strategic-merge-patch.md index c1d69c1a..4f45ef8e 100644 --- a/contributors/devel/strategic-merge-patch.md +++ b/contributors/devel/strategic-merge-patch.md @@ -35,9 +35,9 @@ container lists to merge together based on the `name` field. To solve this problem, Strategic Merge Patch uses the go struct tag of the API objects to determine what lists should be merged and which ones should not. -Currently the metadata is available as struct tags on the API objects -themselves, but will become available to clients as Swagger annotations in the -future. In the above example, the `patchStrategy` metadata for the `containers` +The metadata is available as struct tags on the API objects +themselves and also available to clients as [OpenAPI annotations](https://github.com/kubernetes/kubernetes/blob/master/api/openapi-spec/README.md#x-kubernetes-patch-strategy-and-x-kubernetes-patch-merge-key). +In the above example, the `patchStrategy` metadata for the `containers` field would be `merge` and the `patchMergeKey` would be `name`. -- cgit v1.2.3