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 1934080: Preserve existing ServiceAccount owner references during installs. #41

Merged
merged 2 commits into from
Apr 14, 2021
Merged

Bug 1934080: Preserve existing ServiceAccount owner references during installs. #41

merged 2 commits into from
Apr 14, 2021

Conversation

timflannagan
Copy link
Contributor

@timflannagan timflannagan commented Apr 8, 2021 •
edited
Loading

A ServiceAccount requirement in a ClusterServiceVersion is considered
unsatisfied if it is not owned by the CSV and it is owned by a
different CSV. During InstallPlan execution, owner references in
ServiceAccount steps replace existing owner references. As a result, a
CSV that is being replaced may transition to Failed (requirements not
met) and block replacement.

Signed-off-by: Ben Luddy bluddy@redhat.com

Upstream commit: 1e463a9076f57d77122ab6ef22d445189776c3aa

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 8, 2021
@openshift-ci-robot
Copy link

@timflannagan: This pull request references Bugzilla bug 1934080, 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.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

Bug 1934080: Preserve existing ServiceAccount owner references during installs.

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
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timflannagan

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 8, 2021
@timflannagan
Copy link
Contributor Author

/assign benluddy

@openshift-ci-robot
Copy link

@timflannagan: This pull request references Bugzilla bug 1934080, which is valid.

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

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

Bug 1934080: Preserve existing ServiceAccount owner references during installs.

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.

@timflannagan timflannagan reopened this Apr 8, 2021
@openshift-ci-robot
Copy link

@timflannagan: This pull request references Bugzilla bug 1934080. The bug has been updated to no longer refer to the pull request using the external bug tracker.

In response to this:

Bug 1934080: Preserve existing ServiceAccount owner references during installs.

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
Copy link

@timflannagan: This pull request references Bugzilla bug 1934080, which is valid. 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.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

Bug 1934080: Preserve existing ServiceAccount owner references during installs.

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.

@benluddy
Copy link
Contributor

benluddy commented Apr 8, 2021

/retest

@timflannagan timflannagan force-pushed the bug-preserver-existing-sa-owner-refs-install branch from 0501058 to d4d553f Compare April 8, 2021 17:55
@timflannagan
Copy link
Contributor Author

My bad - forgot to update the root vendor. Should be fine now passing that verify check.

@timflannagan
Copy link
Contributor Author

Not sure how I missed that these changes aren't in the right staging tree.

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 8, 2021
@timflannagan timflannagan force-pushed the bug-preserver-existing-sa-owner-refs-install branch from d4d553f to 3da2bf5 Compare April 8, 2021 18:30
@timflannagan
Copy link
Contributor Author

/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 Apr 8, 2021
@timflannagan
Copy link
Contributor Author

/retest

2 similar comments
@timflannagan
Copy link
Contributor Author

/retest

@timflannagan
Copy link
Contributor Author

/retest

@kevinrizza
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 9, 2021
@timflannagan
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

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

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@timflannagan
Copy link
Contributor Author

/retest

1 similar comment
@timflannagan
Copy link
Contributor Author

/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.

@timflannagan
Copy link
Contributor Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 12, 2021
@ecordell
Copy link
Contributor

/hold cancel

a major cause of e2e-upgrade failures just merged

@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 Apr 13, 2021
@ecordell
Copy link
Contributor

/cherry-pick release-4.7

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.7

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
Contributor

/retest

@openshift-bot
Copy link
Contributor

/retest

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

@timflannagan
Copy link
Contributor Author 

failed to acquire lease: status 503 Service Unavailable, status code 503
--

/retest

@openshift-bot
Copy link
Contributor

/retest

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

7 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@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 03e31a8 into openshift:master Apr 14, 2021
@openshift-ci-robot
Copy link

@timflannagan: All pull requests linked via external trackers have merged:

Bugzilla bug 1934080 has been moved to the MODIFIED state.

In response to this:

Bug 1934080: Preserve existing ServiceAccount owner references during installs.

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.

@timflannagan timflannagan deleted the bug-preserver-existing-sa-owner-refs-install branch April 14, 2021 18:05
@openshift-cherrypick-robot
Copy link

@ecordell: #41 failed to apply on top of branch "release-4.7":

Applying: Preserve existing ServiceAccount owner references during installs.
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
M	staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Preserve existing ServiceAccount owner references during installs.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.7

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

@ankitathomas ankitathomas Awaiting requested review from ankitathomas

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

Assignees

@benluddy benluddy

@kevinrizza kevinrizza

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@timflannagan @openshift-ci-robot @benluddy @kevinrizza @ankitathomas @openshift-bot @ecordell @openshift-cherrypick-robot @openshift-merge-robot