Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
d19c4d5a
Commit
d19c4d5a
authored
Oct 19, 2017
by
zouyee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update readme about strategic-merge-patch
parent
9a7800f7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
README.md
api/openapi-spec/README.md
+3
-3
No files found.
api/openapi-spec/README.md
View file @
d19c4d5a
...
@@ -4,7 +4,7 @@ This folder contains an [OpenAPI specification][openapi] for Kubernetes API.
...
@@ -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:
...
@@ -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
)
.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment