Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🏃 Remove MachineSet controller Update fallback #2913

Merged

Conversation

benmoss
Copy link

@benmoss benmoss commented Apr 15, 2020

What this PR does / why we need it:
Removes some somewhat crufty logic around falling back to using Update when Patch fails on MachineSets due to validations. It seems that the patch that is constructed will never contain replicas: 0, so it fails validation because it was a required field.

By marking it as optional and omitempty it won't be submitted to the server, we can just rely on it having a default of 0 by virtue of being a Go value type.

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 #1945

/assign @vincepri

By marking it as optional and omitempty it won't be submitted to the
server, we can just rely on it having a default of 0 by virtue of being
a value type
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 15, 2020
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 15, 2020
@vincepri
Copy link
Member

/milestone v0.3.4

@k8s-ci-robot k8s-ci-robot added this to the v0.3.4 milestone Apr 15, 2020
@vincepri
Copy link
Member

vincepri commented Apr 15, 2020

@benmoss Have you run some manual tests with tilt and/or clusterctl to double-check existing functionality isn't breaking after this change?

More specifically:

  • Create a MachineDeployment
  • Scale up / down
  • Roll out a new version

MachineDeployment controller tests also exercise MachineSet, which is why I'm suggesting using a MD.

@benmoss
Copy link
Author

benmoss commented Apr 15, 2020

Will do

@benmoss
Copy link
Author

benmoss commented Apr 15, 2020

Everything seems fine with scale up / scale down / upgrade rollouts 👍

Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 15, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benmoss, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 15, 2020
@k8s-ci-robot k8s-ci-robot merged commit e3a4ed7 into kubernetes-sigs:master Apr 15, 2020
@benmoss benmoss deleted the machineset-replicas-default branch April 15, 2020 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MachineSet shouldn't use update as a fallback for Status.Replicas
3 participants