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

🐛 Fix SetControllerReference to consider multiple CRD versions #707

Merged

Conversation

sebgl
Copy link
Contributor

@sebgl sebgl commented Dec 3, 2019

Fixes #699.

An error was returned by the call to SetControllerReference if the owner
is already set, but with a different apiVersion (eg. group/v1beta1
instead of group/v1).

This commit fixes it by ignoring the version in the ref comparison. It
still considers the group though. Having an owner with a different
version does not return an error, but the call to
SetControllerReference effectively changes the owner to match the
newer apiVersion.

An error was returned by a call to `SetControllerReference` if the owner
is already set, but with a different apiVersion (eg. `group/v1beta1`
instead of `group/v1`).

This commit fixes it by ignoring the version in the ref comparison. It
still considers the group though. Having an owner with a different
version does not return an error, but the call to
`SetControllerReference` effectively changes the owner to match the
newer apiVersion.
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 3, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @sebgl. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 3, 2019
@DirectXMan12 DirectXMan12 changed the title Fix SetControllerReference to consider multiple CRD versions 🐛 Fix SetControllerReference to consider multiple CRD versions Dec 3, 2019
@DirectXMan12
Copy link
Contributor

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DirectXMan12, sebgl

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 Dec 3, 2019
@k8s-ci-robot k8s-ci-robot merged commit ce6bd39 into kubernetes-sigs:master Dec 3, 2019
sebgl added a commit to sebgl/cloud-on-k8s that referenced this pull request Dec 4, 2019
Temporarily duplicate the fixed version of
`controllerutil.SetControllerReference` in our own code, until we get a
proper release of controller-runtime with the fix.

At which point we can safely remove this file and rely on
`controllerutil.SetControllerReference` again.

controller-runtime PR including the fix:
kubernetes-sigs/controller-runtime#707
sebgl added a commit to elastic/cloud-on-k8s that referenced this pull request Dec 4, 2019
* Fix controllerutil.SetControllerReference to ignore apiVersions

Temporarily duplicate the fixed version of
`controllerutil.SetControllerReference` in our own code, until we get a
proper release of controller-runtime with the fix.

At which point we can safely remove this file and rely on
`controllerutil.SetControllerReference` again.

controller-runtime PR including the fix:
kubernetes-sigs/controller-runtime#707

* Set volumeClaimTemplate namespace to match ES namespace

The latest version of `controllerutil.SetControllerReference` does a
safety check on owner vs. object namespace mismatches.
We technically don't need to include a namespace in the
VolumeClaimtemplates of a StatefulSet, but since we know in which
namespace the PVC will be created anyway, it's safe to include the
namespace so we pass the function safety check.
DirectXMan12 pushed a commit that referenced this pull request Jan 31, 2020
🏃 use k8s 1.14.1 in test scripts
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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SetControllerReference incompatible with CRD version upgrade
3 participants