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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃悰 ClusterClass: patch MachineDeployment selector authoritatively #5731

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Nov 24, 2021

Signed-off-by: Stefan B眉ringer buringerst@vmware.com

What this PR does / why we need it:
The labels we apply to the MD changed slightly from v1.0 to main (in the cluster topology reconciler). As we were only patching the metadata.labels but not the selector authoritatively the topology reconciler wasn't able to patch the labels (because the webhook enforces that the metadata.labels match the selector)

Slightly more context: https://kubernetes.slack.com/archives/C8TSNPY4T/p1637763270197700?thread_ts=1637762697.197400&cid=C8TSNPY4T

Verified locally in addition to the unit test by:

  • deploying the quickstart e2e test stuff on top of a tilt managed management cluster
  • added a label to selector and metadata.labels
  • verified that topology reconciler does (and is able to) drop the additional label from both

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 #

Signed-off-by: Stefan B眉ringer buringerst@vmware.com
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 24, 2021
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 24, 2021
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

Nice catch!

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

[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 /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 Nov 29, 2021
@k8s-ci-robot k8s-ci-robot merged commit bcc2509 into kubernetes-sigs:main Nov 29, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Nov 29, 2021
@sbueringer sbueringer deleted the pr-authoritative-patch-md-selector branch November 29, 2021 08:29
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.

None yet

3 participants