mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #54241 from zouyee/strategic-merge-patch
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. update strategic-merge-patch link **What this PR does / why we need it**: update strategic-merge-patch link **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ``` NONE ```
This commit is contained in:
commit
2296c73292
@ -4,7 +4,7 @@ This folder contains an [OpenAPI specification][openapi] for Kubernetes API.
|
|||||||
|
|
||||||
## Vendor Extensions
|
## Vendor Extensions
|
||||||
|
|
||||||
Kuberntes extends OpenAPI using these extensions. Note the version that
|
Kuberntes extends OpenAPI using these extensions. Note the version that
|
||||||
extensions has been added.
|
extensions has been added.
|
||||||
|
|
||||||
### `x-kubernetes-group-version-kind`
|
### `x-kubernetes-group-version-kind`
|
||||||
@ -56,5 +56,5 @@ For example:
|
|||||||
|
|
||||||
### `x-kubernetes-patch-strategy` and `x-kubernetes-patch-merge-key`
|
### `x-kubernetes-patch-strategy` and `x-kubernetes-patch-merge-key`
|
||||||
|
|
||||||
Some of the definitions may have these extensions. For more information about PatchStrategy and PatchMergeKey see
|
Some of the definitions may have these extensions. For more information about PatchStrategy and PatchMergeKey see
|
||||||
[strategic-merge-patch] (https://github.com/kubernetes/community/blob/3a1e6d22f812751ee88eccf7c59101852de63d5b/contributors/devel/strategic-merge-patch.md).
|
[strategic-merge-patch] (https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md).
|
||||||
|
Loading…
Reference in New Issue
Block a user