🌱 Support patch ForceOverwriteConditions option #3643
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
the
cncf-cla: yes
k8s-ci-robot
added
the
size/M
vincepri
force-pushed
the
conditions-force-overwrite
branch
from
fe947a8
to
5445e2a
Compare
|
/milestone v0.3.10 |
vincepri
force-pushed
the
conditions-force-overwrite
branch
from
5445e2a
to
7dda7ee
Compare
k8s-ci-robot
added
lgtm
vincepri
force-pushed
the
conditions-force-overwrite
branch
from
7dda7ee
to
b005aca
Compare
k8s-ci-robot
removed
lgtm
|
/lgtm |
k8s-ci-robot
added
the
lgtm
Signed-off-by: Vince Prignano <vincepri@vmware.com>
vincepri
force-pushed
the
conditions-force-overwrite
branch
from
b005aca
to
2ea9aeb
Compare
k8s-ci-robot
removed
the
lgtm
k8s-ci-robot
added
the
lgtm
|
@ncdc Over to you for a final review / approval |
|
/assign @detiber If you have some time to review / approve :) |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: detiber 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 files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
/retest |
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.
Signed-off-by: Vince Prignano vincepri@vmware.com
What this PR does / why we need it:
This PR adds support for an option in the patch helper that allows controllers to force-overwrite conditions in case of a conflict.
This option should only be used in owning controllers, for example the Machine controller can set it when patching machines. While nothing will stop a different controller from using this option on non-owned objects, this is true as well if folks aren't using our patch helper.
/assign @ncdc @fabriziopandini