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.

Sign up for GitHub

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

Jump to bottom

⚠️ in-place propagation from MD to MS #8110

Merged
merged 1 commit into from
Feb 22, 2023
Merged

⚠️ in-place propagation from MD to MS #8110

merged 1 commit into from
Feb 22, 2023

Conversation

ykakarap
Copy link
Contributor

What this PR does / why we need it:

This PR implements the in-place propagation behavior for MachineDeployments.
The PR contains the following features:

  • Changes to in-place propagation fields in MachineDeployment will not trigger a MachineSet rollout
  • Changes to in-place propagation fields in MachineDeployment are synced to the target MachineSet
    • Example: A user can changemd.spec.template.metadata.labels without triggering a rollout and the changes will be passed down to the target MachineSet.

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 #

Part of #7731

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 14, 2023
@ykakarap ykakarap mentioned this pull request Feb 14, 2023
Closed
CecileRobertMichon
CecileRobertMichon reviewed Feb 15, 2023
View reviewed changes
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

Am a little confused about the desired UX and backwards compatibility story on this one... it's possible I'm missing something

api/v1beta1/machinedeployment_types.go Show resolved Hide resolved
internal/util/ssa/managedfields.go Outdated Show resolved Hide resolved
internal/controllers/machinedeployment/machinedeployment_sync.go Show resolved Hide resolved
internal/controllers/machinedeployment/machinedeployment_sync.go Show resolved Hide resolved
api/v1beta1/machinedeployment_types.go Show resolved Hide resolved
@ykakarap ykakarap mentioned this pull request Feb 21, 2023
Closed
19 tasks
@ykakarap ykakarap force-pushed the node-label-in-place-propagation_md-ms branch from 08c199e to e926767 Compare February 22, 2023 06:54
@ykakarap
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-26-latest-main

@ykakarap ykakarap force-pushed the node-label-in-place-propagation_md-ms branch from e926767 to 730e6b6 Compare February 22, 2023 07:44
@ykakarap
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-26-latest-main

@ykakarap ykakarap force-pushed the node-label-in-place-propagation_md-ms branch from 730e6b6 to c6618d7 Compare February 22, 2023 16:27
@sbueringer
Copy link
Member

Thx, great work!

/lgtm

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

LGTM label has been added.

Git tree hash: 4a2f9121843dda66e693be9154a027f99bddcd84

@sbueringer
Copy link
Member

/assign @fabriziopandini

vincepri
vincepri approved these changes Feb 22, 2023
View reviewed changes
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.

Great job @ykakarap ! LGTM from my side

CecileRobertMichon
CecileRobertMichon reviewed Feb 22, 2023
View reviewed changes
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

lgtm!

Are you planning on squashing commits before merge?

@ykakarap
Copy link
Contributor Author

lgtm!

Are you planning on squashing commits before merge?

Yes. Looks like everyone reviewed the modified machine template hash logic. I will squash it.

@ykakarap ykakarap force-pushed the node-label-in-place-propagation_md-ms branch from c6618d7 to 8e06d16 Compare February 22, 2023 18:39
@ykakarap
Copy link
Contributor Author

Commits are squashed.

@sbueringer
Copy link
Member

/lgtm

@ykakarap
Copy link
Contributor Author

Special thanks to @sbueringer and @fabriziopandini for helping with brainstorming and the regular feedback 🙏🏼

@sbueringer
Copy link
Member

Great work!! Not exactly the most trivial part of our code base ;)

@ykakarap
Copy link
Contributor Author

/test pull-cluster-api-test-main

@ykakarap
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-26-latest-main

@ykakarap
Copy link
Contributor Author

/test pull-cluster-api-test-main

Looks like a flake. Test unrelated to this PR failed.

@sbueringer
Copy link
Member

/retest

Yup and all of them just recently added in other prs. Looks like we have some new flakes to fix

@fabriziopandini
Copy link
Member

Great work @ykakarap and thanks everyone for your valuable feedback!
/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 Feb 22, 2023
@k8s-ci-robot k8s-ci-robot merged commit 744f3ff into kubernetes-sigs:main Feb 22, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Feb 22, 2023
@sbueringer sbueringer mentioned this pull request May 2, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@vincepri vincepri vincepri approved these changes

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

Assignees

@sbueringer sbueringer

@fabriziopandini fabriziopandini

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ykakarap @sbueringer @k8s-ci-robot @fabriziopandini @vincepri @CecileRobertMichon