🐛 Improve handling of patching and updates in MachineSet and MachineDeployment controllers #1380
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
do-not-merge/work-in-progress
|
[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
approved
ncdc
reviewed
Sep 5, 2019
| @@ -341,7 +342,7 @@ func (r *MachineDeploymentReconciler) syncDeploymentStatus(allMSs []*clusterv1.M | |||
|
|
|||
| patch := client.MergeFrom(d.DeepCopy()) | |||
| d.Status = newStatus | |||
| return r.Status().Patch(context.Background(), d, patch) | |||
| return r.Status().Patch(context.Background(), d.DeepCopy(), patch) | |||
There was a problem hiding this comment.
Would it be better to avoid doing the DeepCopy twice?
There was a problem hiding this comment.
I don't think we can, will add a comment as to why.
| @@ -413,7 +414,7 @@ func (r *MachineDeploymentReconciler) scaleMachineSetOperation(ms *clusterv1.Mac | |||
| *(ms.Spec.Replicas) = newScale | |||
| mdutil.SetReplicasAnnotations(ms, *(deployment.Spec.Replicas), *(deployment.Spec.Replicas)+mdutil.MaxSurge(*deployment)) | |||
|
|
|||
| err = r.Patch(context.Background(), ms, patch) | |||
| err = r.Client.Patch(context.Background(), ms, patch) | |||
There was a problem hiding this comment.
Does this need to operate on a copy too?
There was a problem hiding this comment.
In this case, I don't think so, because we only update the Metadata of the MachineSet from within the MachineDeployment controller.
| @@ -386,9 +386,10 @@ 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) | |||
There was a problem hiding this comment.
Not needed in this case, since we only update the Metadata of Machines in the MachineSet controller.
vincepri
reviewed
Sep 5, 2019
detiber
force-pushed
the
ImprovePatching
branch
2 times, most recently
from
e4e3d5e
to
d1b1e81
Compare
detiber
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
vincepri
approved these changes
Sep 9, 2019
ncdc
reviewed
Sep 9, 2019
| @@ -111,7 +111,8 @@ func (r *MachineDeploymentReconciler) reconcile(ctx context.Context, d *clusterv | |||
| if d.Status.ObservedGeneration < d.Generation { | |||
| patch := client.MergeFrom(d.DeepCopy()) | |||
| d.Status.ObservedGeneration = d.Generation | |||
| if err := r.Client.Status().Patch(ctx, d, patch); err != nil { | |||
| // Patch using a deep copy to avoid overwriting any unexpcted Spec/Metadata changes from the returned result | |||
There was a problem hiding this comment.
Suggested change
| // Patch using a deep copy to avoid overwriting any unexpcted Spec/Metadata changes from the returned result | |
| // Patch using a deep copy to avoid overwriting any unexpected Spec/Metadata changes from the returned result |
ncdc
reviewed
Sep 9, 2019
detiber
force-pushed
the
ImprovePatching
branch
from
d1b1e81
to
7139c0d
Compare
…loyment controllers
detiber
force-pushed
the
ImprovePatching
branch
from
7139c0d
to
feeea0c
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.
What this PR does / why we need it:
Improves handling of patch and update semantics used by MachineSet and MachineDeployment controllers
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 #1349