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

[release-1.8] 🌱 Call patchHelper only if necessary when reconciling external refs #11684

Merged

Conversation

sbueringer
Copy link
Member

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
Manual cherry-pick of #11666

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 #

@sbueringer sbueringer added the area/util Issues or PRs related to utils label Jan 14, 2025
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Jan 14, 2025
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 14, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 14, 2025
@sbueringer sbueringer force-pushed the pr-patch-rec-ext-1.8 branch from 9c61b04 to 8c6e1b4 Compare January 14, 2025 15:09
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-release-1-8

UID: cluster.UID,
}

if util.HasExactOwnerRef(obj.GetOwnerReferences(), desiredOwnerRef) {
Copy link
Member

Choose a reason for hiding this comment

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

Note: this here lacks checking if the uid matches :think:

Copy link
Member

@chrischdi chrischdi Jan 14, 2025

Choose a reason for hiding this comment

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

(same in machineset controller and propably others)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup. I think you're right. I'll follow-up tomorrow with a PR against main

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's merge this PR independent of that. Will open a PR against main in a few minutes and then we can cherry-pick that one into 1.9 + 1.8

Copy link
Member Author

Choose a reason for hiding this comment

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

Fix PR: #11688

@fabriziopandini
Copy link
Member

/lgtm
/approve

/hold for @chrischdi to take a final look

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 15, 2025
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 15, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ce2861bf9bc8ea87a58ffc41b73a37aabc3e9e24

@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 Jan 15, 2025
@chrischdi
Copy link
Member

/lgtm

Fix for above will come from cherry-picking #11688

@sbueringer
Copy link
Member Author

/hold cancel

Thx folks!

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 15, 2025
@k8s-ci-robot k8s-ci-robot merged commit b127c62 into kubernetes-sigs:release-1.8 Jan 15, 2025
20 checks passed
@sbueringer sbueringer deleted the pr-patch-rec-ext-1.8 branch January 15, 2025 09:58
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. area/util Issues or PRs related to utils 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants