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 1691546: fix(catalog): do not add owner references to clusterroles or crbs #900

Merged
merged 1 commit into from
Jun 18, 2019
Merged

Bug 1691546: fix(catalog): do not add owner references to clusterroles or crbs #900

merged 1 commit into from
Jun 18, 2019

Conversation

ecordell
Copy link
Member

@ecordell ecordell commented Jun 10, 2019 •
edited
Loading

Operators requesting Cluster Permissions could hit a kube GC bug

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 10, 2019
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 10, 2019
@ecordell
Copy link
Member Author

/retest

@ecordell ecordell changed the title fix(catalog): do not add owner references to clusterroles or crbs bug:1691546 fix(catalog): do not add owner references to clusterroles or crbs Jun 11, 2019
@ecordell
Copy link
Member Author

/retest

1 similar comment
@njhale
Copy link
Member

njhale commented Jun 13, 2019

/retest

@jpeeler
Copy link
Contributor

jpeeler commented Jun 17, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 17, 2019
tkashem
tkashem approved these changes Jun 17, 2019
View reviewed changes
Copy link
Collaborator

@tkashem tkashem left a comment

Choose a reason for hiding this comment

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

/lgtm

pkg/controller/operators/catalog/operator.go
// Attempt to create the ClusterRole.
_, err = o.OpClient.KubernetesInterface().RbacV1().ClusterRoles().Create(&cr)
if k8serrors.IsAlreadyExists(err) {
// if we're updating, point owner to the newest csv
cr.Labels[ownerutil.OwnerKey] = step.Resolving
Copy link
Collaborator

Choose a reason for hiding this comment

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

question: how is this label ownerutil.OwnerKey used?

Copy link
Member Author

Choose a reason for hiding this comment

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

it's a label that points to the owner for cases where we can't use real ownerrefs

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jun 17, 2019
@jpeeler
Copy link
Contributor

jpeeler commented Jun 17, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 17, 2019
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, jpeeler, tkashem

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

@ecordell
Copy link
Member Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit e1fd0d3 into operator-framework:master Jun 18, 2019
@ecordell
Copy link
Member Author

/cherry-pick release-4.1

@ecordell
Copy link
Member Author

/cherrypick release-4.1

@ecordell ecordell changed the title bug:1691546 fix(catalog): do not add owner references to clusterroles or crbs Bug 1691546: fix(catalog): do not add owner references to clusterroles or crbs Jun 19, 2019
@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 Jun 19, 2019
@openshift-ci-robot
Copy link
Collaborator

@ecordell: This pull request references a valid Bugzilla bug.

In response to this:

Bug 1691546: fix(catalog): do not add owner references to clusterroles or crbs

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.

@stevekuznetsov
Copy link
Member

/cherrypick release-4.1

1 similar comment
@stevekuznetsov
Copy link
Member

/cherrypick release-4.1

@openshift-cherrypick-robot
Copy link

@stevekuznetsov: only operator-framework org members may request cherry picks. You can still do the cherry-pick manually.

In response to this:

/cherrypick release-4.1

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.

@ecordell
Copy link
Member Author

/cherrypick release-4.1

@openshift-cherrypick-robot
Copy link

@ecordell: only operator-framework org members may request cherry picks. You can still do the cherry-pick manually.

In response to this:

/cherrypick release-4.1

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.

@ecordell
Copy link
Member Author

/cherrypick release-4.1

@openshift-cherrypick-robot
Copy link

@ecordell: #900 failed to apply on top of branch "release-4.1":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/controller/operators/catalog/operator.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in pkg/controller/operators/catalog/operator.go
Patch failed at 0001 fix(catalog): do not add owner references to clusterroles or crbs

In response to this:

/cherrypick release-4.1

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.

@ecordell ecordell mentioned this pull request Jun 19, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpeeler jpeeler jpeeler left review comments

@njhale njhale njhale left review comments

@tkashem tkashem tkashem approved these changes

@alecmerdler alecmerdler Awaiting requested review from alecmerdler

Assignees

@jpeeler jpeeler

@tkashem tkashem

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ecordell @njhale @jpeeler @openshift-ci-robot @stevekuznetsov @openshift-cherrypick-robot @tkashem @openshift-merge-robot