-
Notifications
You must be signed in to change notification settings - Fork 1.4k
🐛 Fix KCP KubeadmConfig isJoin detection #13035
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
🐛 Fix KCP KubeadmConfig isJoin detection #13035
Conversation
|
/test pull-cluster-api-e2e-main-gke |
Signed-off-by: Stefan Büringer [email protected]
9b6dfd1 to
0046d1c
Compare
|
/test pull-cluster-api-e2e-main-gke |
|
@sbueringer: The following test failed, say
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. |
neolit123
left a comment
There was a problem hiding this 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 { |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
chrischdi
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
|
LGTM label has been added. Git tree hash: e821d390e2a34b726de5e6f157041253010defd5
|
fabriziopandini
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/approve
|
[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 |
|
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) |
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 #