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

⚠️ util.{Machine,Cluster}ToInfrastructureMapFunc should exclude version when parsing object references #2786

Merged

Conversation

jan-est
Copy link
Contributor

@jan-est jan-est commented Mar 26, 2020

This bugfix will fix the matching issue discussed in 2775 using match on group kind and not version in.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 26, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @jan-est. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 26, 2020
@JoelSpeed
Copy link
Contributor

Had a dig through the code to properly understand what's going on here, what used to happen is that you could have two versions for your CRD (eg v1alpha2 and v1alpha3), except if you updated the CRD as a v1alpha2 and the controller is expecting resources of v1alpha3 this wouldn't cause a reconcile? Whereas with this change you will reconcile the CRD no matter which version the event was triggered against? And that's fine cause conversion will make it so the controller can load any "version" as it were as the version it expects

@vincepri
Copy link
Member

@JoelSpeed that is correct, if you had two different versions on the same contract the objects won't be reconciled properly. Having reconciliation on objects with different API versions is fine because of conversion as you mentioned.

@JoelSpeed
Copy link
Contributor

In which case, everything looks good here :)

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 26, 2020
@vincepri
Copy link
Member

/retitle ⚠️ util.{Machine,Cluster}ToInfrastructureMapFunc should exclude version when parsing object references

@k8s-ci-robot k8s-ci-robot changed the title ⚠️ Bugfix for match issue in 2775 ⚠️ util.{Machine,Cluster}ToInfrastructureMapFunc should exclude version when parsing object references Mar 26, 2020
@vincepri
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 26, 2020
@vincepri
Copy link
Member

/milestone v0.3.3
/approve

@k8s-ci-robot k8s-ci-robot added this to the v0.3.3 milestone Mar 26, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan-est, 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 Mar 26, 2020
@k8s-ci-robot k8s-ci-robot merged commit 68ba258 into kubernetes-sigs:master Mar 26, 2020
@jan-est jan-est deleted the fix-issue-2775-match-jan branch March 27, 2020 07:13
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants