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

🐛 Recognize MachinePool as a bootstrap config owner #2406

Merged

Conversation

juan-lee
Copy link
Contributor

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

Signed-off-by: Juan-Lee Pang <jpang@microsoft.com>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 23, 2020
@@ -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() {
Copy link
Member

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?

Copy link
Contributor

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?

Copy link
Member

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

@vincepri vincepri added this to the v0.3.0-rc.2 milestone Feb 24, 2020
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[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 /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 Feb 24, 2020
@ncdc ncdc changed the title 🐛 Recongnize MachinePool as a bootstrap config owner 🐛 Recognize MachinePool as a bootstrap config owner Feb 24, 2020
@vincepri
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 25, 2020
@k8s-ci-robot k8s-ci-robot merged commit cab06ca into kubernetes-sigs:master Feb 25, 2020
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. 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.

MachinePool should be a valid bootstrap config owner
5 participants