Skip to content

Conversation

@fabriziopandini
Copy link
Member

@fabriziopandini fabriziopandini commented Nov 10, 2025

What this PR does / why we need it:

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

/area provider/control-plane-kubeadm

@k8s-ci-robot k8s-ci-robot added area/provider/control-plane-kubeadm Issues or PRs related to KCP cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 10, 2025
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 10, 2025
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-main-gke

@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 Nov 10, 2025
@sbueringer sbueringer removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 10, 2025
@sbueringer
Copy link
Member

Thx!

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 07fba791b0c572ea8a571745ffe06aeace844732

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 10, 2025
@k8s-ci-robot k8s-ci-robot merged commit 81b54d8 into kubernetes-sigs:main Nov 10, 2025
27 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Nov 10, 2025
@fabriziopandini
Copy link
Member Author

/cherry-pick release-1.11

@fabriziopandini
Copy link
Member Author

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@fabriziopandini: new pull request created: #12986

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot

@fabriziopandini: #12980 failed to apply on top of branch "release-1.10":

Applying: Fix race condition on KCP initialized condition
Using index info to reconstruct a base tree...
M	controlplane/kubeadm/internal/controllers/status.go
M	controlplane/kubeadm/internal/controllers/status_test.go
Falling back to patching base and 3-way merge...
Auto-merging controlplane/kubeadm/internal/controllers/status_test.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/controllers/status_test.go
Auto-merging controlplane/kubeadm/internal/controllers/status.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/controllers/status.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix race condition on KCP initialized condition

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@fabriziopandini
Copy link
Member Author

fabriziopandini commented Nov 11, 2025

After looking into it, I have decided not backport to 1.10 for now.

The reason is that in 1.10 there is not yet a clean separation between regular code and conditions computation, and so the fix must be re-implemented from scratch

(feel free to pick it up if you have bandwidth)

@fabriziopandini fabriziopandini deleted the fix-race-on-kcp-initialized branch November 11, 2025 16:04
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/provider/control-plane-kubeadm Issues or PRs related to KCP 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

KCP should not consider control plane initialized if there is only a machine being deleted.

4 participants