🐛Fix patch in MachineSet adoption #1430
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
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: vincepri 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
vincepri
force-pushed
the
fix-ms-adoption
branch
from
a626599
to
3bb6817
Compare
k8s-ci-robot
added
size/S
vincepri
force-pushed
the
fix-ms-adoption
branch
from
3bb6817
to
a454880
Compare
detiber
reviewed
Sep 20, 2019
| @@ -386,7 +386,7 @@ func shouldExcludeMachine(machineSet *clusterv1.MachineSet, machine *clusterv1.M | |||
|
|
|||
| // adoptOrphan sets the MachineSet as a controller OwnerReference to the Machine. | |||
| func (r *MachineSetReconciler) adoptOrphan(machineSet *clusterv1.MachineSet, machine *clusterv1.Machine) error { | |||
| patch := client.MergeFrom(machine) | |||
| patch := client.MergeFrom(machine.DeepCopy()) | |||
There was a problem hiding this comment.
😬 Since this goes back to my patch updates I went ahead to see if I messed up any other places, and it turns out I did: https://github.com/kubernetes-sigs/cluster-api/blob/master/controllers/machinedeployment_sync.go#L106
There was a problem hiding this comment.
Great catch! Added to the PR
Signed-off-by: Vince Prignano <vincepri@vmware.com>
vincepri
force-pushed
the
fix-ms-adoption
branch
from
a454880
to
be14d06
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
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:
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #1429