Skip to content

Conversation

@sbueringer
Copy link
Member

@sbueringer sbueringer commented Nov 24, 2025

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

What this PR does / why we need it:

The previous check relied on a reconcile by CABPK to add the discovery field, this didn't work in all cases.
Now KCP itself directly adds a field (controlPlane) based on which it can detect if a KubeadmConfig is for join

Follow-up to #13026

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 #

@k8s-ci-robot k8s-ci-robot added the do-not-merge/needs-area PR is missing an area label label Nov 24, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 24, 2025
@sbueringer
Copy link
Member Author

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 24, 2025
@sbueringer sbueringer added the area/provider/control-plane-kubeadm Issues or PRs related to KCP label Nov 24, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Nov 24, 2025
@sbueringer
Copy link
Member Author

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

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-apidiff-main 0046d1c link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

seems like a better approach for checking " is join".

// cluster is using an external etcd in the kubeadm bootstrap provider (even if this is not required by kubeadm Join).
// Note: We are always setting JoinConfiguration.ControlPlane so we can later identify this KubeadmConfig as a
// join KubeadmConfig.
if spec.JoinConfiguration.ControlPlane == nil {
Copy link
Member

Choose a reason for hiding this comment

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

is spec.JoinConfiguration non-nil at this point?

Copy link
Member Author

@sbueringer sbueringer Nov 24, 2025

Choose a reason for hiding this comment

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

spec.joinConfiguration is not a pointer

Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm

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

LGTM label has been added.

Git tree hash: e821d390e2a34b726de5e6f157041253010defd5

Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

/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 Nov 24, 2025
@k8s-ci-robot k8s-ci-robot merged commit ff25fdb into kubernetes-sigs:main Nov 24, 2025
19 of 20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Nov 24, 2025
@sbueringer sbueringer deleted the pr-fix-KCP-isjoin branch November 24, 2025 14:08
@sbueringer
Copy link
Member Author

sbueringer commented Nov 24, 2025

To add a bit of context. The previous check relied on a reconcile by CABPK to add the discovery field. Now KCP itself directly adds a field (controlPlane) based on which it can detect if a KubeadmConfig is for join

(also updated PR description)

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/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.

5 participants