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.

Sign up for GitHub

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

Jump to bottom

Bug 1808113: Fix OwnerReferences for bundled CRs #1341

Merged
merged 2 commits into from Mar 4, 2020
Merged

Bug 1808113: Fix OwnerReferences for bundled CRs #1341

merged 2 commits into from Mar 4, 2020

Conversation

njhale
Copy link
Member

@njhale njhale commented Mar 3, 2020 •
edited

Description of the change:

Fix InstallPlan execution to generate OwnerReferences on CRs applied to the respective CSV rather than the InstallPlan itself.

Motivation for the change:

Currently, bundled CRs are given OwnerReferences to the InstallPlan they were applied from, which is incorrect.

@njhale
test(installplan): add cr ownerref unit testcase
7697393 
Add a unit testcase to ensure custom resources created by InstallPlan execution are ownerrefed to the accompanying CSV only.
@njhale
Copy link
Member Author

njhale commented Mar 3, 2020

/hold

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 3, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 3, 2020
@njhale njhale changed the title Bug Fix ip orefs Bug 1808113: Fix OwnerReferences for bundled CRs Mar 3, 2020
@openshift-ci-robot
Copy link
Collaborator

@njhale: This pull request references Bugzilla bug 1808113, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1808113: Fix OwnerReferences for bundled CRs

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Mar 3, 2020
@openshift-ci-robot
Copy link
Collaborator

@njhale: This pull request references Bugzilla bug 1808113, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1808113: Fix OwnerReferences for bundled CRs

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.

awgreene
awgreene requested changes Mar 3, 2020
View reviewed changes
Copy link
Member

@awgreene awgreene left a comment

Choose a reason for hiding this comment

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

Nice work @njhale - had a few nits but I think this can be merged quite quickly.

pkg/controller/operators/catalog/testdata/prometheusrule.cr.yaml Outdated Show resolved Hide resolved
pkg/controller/operators/catalog/operator.go Outdated Show resolved Hide resolved
pkg/controller/operators/catalog/operator.go Outdated Show resolved Hide resolved
pkg/controller/operators/catalog/operator_test.go Outdated Show resolved Hide resolved
pkg/controller/operators/catalog/operator_test.go Show resolved Hide resolved
@njhale
Copy link
Member Author

njhale commented Mar 3, 2020

/retest

@njhale
Copy link
Member Author

njhale commented Mar 3, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 3, 2020
@exdx
Copy link
Member

exdx commented Mar 3, 2020

/lgtm

this only applies to the ownership of the new prometheus-related CRs right? No other effect on previous releases

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 3, 2020
@exdx
Copy link
Member

exdx commented Mar 3, 2020

/retest

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: exdx, njhale

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

@njhale
Copy link
Member Author

njhale commented Mar 3, 2020

/retest

3 similar comments
@njhale
Copy link
Member Author

njhale commented Mar 3, 2020

/retest

@njhale
Copy link
Member Author

njhale commented Mar 4, 2020

/retest

@njhale
Copy link
Member Author

njhale commented Mar 4, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@njhale
Copy link
Member Author

njhale commented Mar 4, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@njhale
Copy link
Member Author

njhale commented Mar 4, 2020

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@njhale: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.4

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.

@njhale
Copy link
Member Author

njhale commented Mar 4, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 0645075 into operator-framework:master Mar 4, 2020
@openshift-ci-robot
Copy link
Collaborator

@njhale: All pull requests linked via external trackers have merged. Bugzilla bug 1808113 has been moved to the MODIFIED state.

In response to this:

Bug 1808113: Fix OwnerReferences for bundled CRs

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 4, 2020
Merged
@openshift-cherrypick-robot
Copy link

@njhale: new pull request created: #1351

In response to this:

/cherry-pick release-4.4

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.

@njhale njhale deleted the fix-ip-orefs branch March 31, 2020 21:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awgreene awgreene awgreene requested changes

@ecordell ecordell Awaiting requested review from ecordell

Assignees

@exdx exdx

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@njhale @openshift-ci-robot @exdx @openshift-bot @openshift-cherrypick-robot @awgreene @openshift-merge-robot