Add info about patch strategy. #7286
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
steveperry-53
added
do-not-merge/hold
k8s-ci-robot
added
the
size/M
|
Deploy preview for kubernetes-io-master-staging ready! Built with commit 258db25 https://deploy-preview-7286--kubernetes-io-master-staging.netlify.com |
| @@ -1,4 +1,4 @@ | |||
| apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2 | |||
| apiVersion: apps/v1beta2 # for versions before 1.9.0 use apps/v1beta2 | |||
There was a problem hiding this comment.
Why this change is needed? We'd better use (and encourage users to use) apps/v1 for 1.9+, right?
There was a problem hiding this comment.
I was experimenting and forgot to change it back to v1. It's back at v1 now.
| @@ -54,7 +54,7 @@ get terminated and replaced by new ones. | |||
| At this point, each Pod has one Container that runs the nginx image. Now suppose | |||
| you want each Pod to have two containers: one that runs nginx and one that runs redis. | |||
|
|
|||
| Create a file named `patch-file.yaml` that has this content: | |||
| Create a file named `patch-file-containers.yaml` that has this content: | |||
|
|
|||
| ```shell | |||
There was a problem hiding this comment.
Since you are here, how about change this to "```yaml"?
| existing list. This is not always what happens when you use a strategic merge patch on a list. | ||
| In some cases, the list is replaced, not merged. | ||
|
|
||
| With a strategic merge patch, a list is either replaced or merged depending it its |
There was a problem hiding this comment.
it its --> its, an extra it.
| patch strategy. The patch strategy is specified by the value of the `patchStrategy` key | ||
| in a field tag. For example, the `Containers` field of PodSpec has a `patchStrategy` of `merge`: | ||
|
|
||
| ```shell |
| You can also see the patch strategy in the | ||
| [OpenApi spec](https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/openapi-spec/swagger.json): | ||
|
|
||
| ```shell |
|
|
||
| Create a file named `patch-file-tolerations.yaml` that has this content: | ||
|
|
||
| ```shell |
| the Tolerations field of PodSpec does not have a `patchStrategy` key in its filed tag. So the | ||
| strategic merge patch uses the default patch strategy, which is `replace`. | ||
|
|
||
| ```shell |
k8s-ci-robot
added
approved
steveperry-53
force-pushed
the
strat-merge
branch
2 times, most recently
from
52d4a53
to
d3485ab
Compare
steveperry-53
force-pushed
the
strat-merge
branch
from
d3485ab
to
258db25
Compare
k8s-ci-robot
added
size/M
|
@xiangpengzhao Thanks for the review. I think I've addressed all of your comments. |
steveperry-53
removed
the
do-not-merge/hold
|
/assign @chenopis |
|
Yup. That definitely resolves my complaint. |
|
/approve |
|
@xiangpengzhao Can you give this an LGTM? Thanks. |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chenopis, steveperry-53, xiangpengzhao The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these OWNERS Files:
Approvers can indicate their approval by writing |
tehut
pushed a commit
to tehut/website
that referenced
this pull request
Feb 20, 2018
bsalamat
pushed a commit
to bsalamat/kubernetes.github.io
that referenced
this pull request
Feb 23, 2018
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses #6222
This change is