diff options
| author | k8s-ci-robot <k8s-ci-robot@users.noreply.github.com> | 2018-01-08 12:42:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 12:42:10 -0800 |
| commit | d3ebc093cece3879f2a220cb537d89e1f03d8f47 (patch) | |
| tree | c87208135bf73dc5f6e3669fbfe4fb7a68d800f3 | |
| parent | a982f3405787d972e89b28bd59e5dcb16621616f (diff) | |
| parent | b5f71cfe61747e8998a34cb4cedb4242f2d66ff6 (diff) | |
Merge pull request #1545 from nikhita/update-strategic-merge-patch
StrategicMergePatch: OpenAPI annotations are now allowed
| -rw-r--r-- | contributors/devel/strategic-merge-patch.md | 6 |
1 files 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`. |