-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
🐛 Recognize MachinePool as a bootstrap config owner #2406
🐛 Recognize MachinePool as a bootstrap config owner #2406
Conversation
Signed-off-by: Juan-Lee Pang <jpang@microsoft.com>
@@ -75,7 +75,7 @@ func (co ConfigOwner) IsControlPlaneMachine() bool { | |||
// GeConfigOwner returns the Unstructured object owning the current resource. | |||
func GetConfigOwner(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*ConfigOwner, error) { | |||
for _, ref := range obj.OwnerReferences { | |||
if ref.Kind == "Machine" && ref.APIVersion == clusterv1.GroupVersion.String() { | |||
if (ref.Kind == "Machine" || ref.Kind == "MachinePool") && ref.APIVersion == clusterv1.GroupVersion.String() { |
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.
This change lgtm, but can you also add additional tests for this behavior in bootstra/util/configowner_test.go
?
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.
Shouldn't we also adjust it to ignore the version portion of ref.APIVersion and just compare on Group + Kind?
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.
Going to merge this and open another PR to follow-up with these comments
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.
/approve
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: juan-lee, 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 |
/lgtm |
Signed-off-by: Juan-Lee Pang jpang@microsoft.com
What this PR does / why we need it:
Adds MachinePool as a valid boostrap provider config owner. Without this, a machine pool's kubeadm boostrap config will never be generated.
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 #2405