[release-4.10] Bug 2080609: Fix GRPC CheckRegistryServer function (#2756) by awgreene · Pull Request #298 · openshift/operator-framework-olm

awgreene · 2022-05-02T14:19:28Z

No description provided.

Problem: The CheckRegistryServer function used by grpc catalogSources does not confirm that the serviceAccount associated with the catalogSource exists. Solution: Update the GRPC CheckRegistryServer function to check if the serviceAccount exists. Signed-off-by: Alexander Greene <greene.al1991@gmail.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 7e8e9f77d08d1bf451ce61b7bb2610473e793ded

Signed-off-by: Alexander Greene <greene.al1991@gmail.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 943a726ab1a516bc231e2fe96d13fc2e47bf4448

openshift-ci · 2022-05-02T14:19:30Z

@awgreene: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

Bz 2080609

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 · 2022-05-02T14:19:58Z

@awgreene: This pull request references Bugzilla bug 2080609, which is invalid:

expected dependent Bugzilla bug 2074612 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

[release-4.10] Bug 2080609: Fix GRPC CheckRegistryServer function (#2756)

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 · 2022-05-02T14:25:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, timflannagan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [awgreene,timflannagan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2022-05-02T17:24:29Z

/retest-required

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

openshift-bot · 2022-05-02T22:26:19Z

/retest-required

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

openshift-bot · 2022-05-03T00:40:16Z

/retest-required

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

openshift-bot · 2022-05-03T01:00:20Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-05-03T01:00:28Z

@openshift-bot: This pull request references Bugzilla bug 2080609, which is invalid:

expected dependent Bugzilla bug 2074612 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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-bot · 2022-05-03T03:30:14Z

/retest-required

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

openshift-bot · 2022-05-03T07:48:16Z

/retest-required

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

openshift-bot · 2022-05-03T10:20:14Z

/retest-required

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

openshift-bot · 2022-05-03T13:20:13Z

/retest-required

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

openshift-bot · 2022-05-03T17:20:15Z

/retest-required

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

openshift-bot · 2022-05-03T19:58:15Z

/retest-required

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

openshift-bot · 2022-05-04T00:31:49Z

/retest-required

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

openshift-bot · 2022-05-04T00:55:49Z

/retest-required

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

openshift-bot · 2022-05-04T01:00:52Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-bot · 2022-05-05T01:00:57Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-05-05T01:01:06Z

@openshift-bot: This pull request references Bugzilla bug 2080609, which is invalid:

expected dependent Bugzilla bug 2074612 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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-bot · 2022-05-05T04:54:56Z

/retest-required

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

openshift-bot · 2022-05-05T07:43:56Z

/retest-required

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

openshift-bot · 2022-05-05T13:12:13Z

/retest-required

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

openshift-bot · 2022-05-05T16:10:14Z

/retest-required

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

openshift-bot · 2022-05-05T18:46:16Z

/retest-required

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

openshift-bot · 2022-05-05T21:38:33Z

/retest-required

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

openshift-ci · 2022-05-05T23:38:57Z

@awgreene: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

openshift-bot · 2022-05-06T01:00:32Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2022-05-06T01:00:52Z

@openshift-bot: This pull request references Bugzilla bug 2080609, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.10.z) matches configured target release for branch (4.10.z)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2074612 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 2074612 targets the "4.11.0" release, which is one of the valid target releases: 4.11.0
bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

Details

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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.

jianzhangbjz · 2022-05-06T09:35:52Z

LGTM based on https://bugzilla.redhat.com/show_bug.cgi?id=2080609#c2
/label cherry-pick-approved

perdasilva · 2022-05-09T11:56:39Z

/backport-risk-assessed

perdasilva · 2022-05-12T14:10:37Z

/label backport-risk-assessed

openshift-ci · 2022-05-12T19:20:02Z

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

openshift/operator-framework-olm#298

Bugzilla bug 2080609 has been moved to the MODIFIED state.

Details

In response to this:

[release-4.10] Bug 2080609: Fix GRPC CheckRegistryServer function (#2756)

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 · 2022-08-26T12:35:40Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2022-08-26T12:36:29Z

@awgreene: #298 failed to apply on top of branch "release-4.9":

Applying: Fix GRPC CheckRegistryServer function (#2756)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go
M	staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
M	staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.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 Fix GRPC CheckRegistryServer function (#2756)
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".

Details

In response to this:

/cherry-pick release-4.9

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.

Signed-off-by: Todd Short <todd.short@me.com> Upstream-repository: api Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7

Signed-off-by: Todd Short <todd.short@me.com> Upstream-repository: api Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7 (cherry picked from commit 55d881b)

awgreene added 2 commits May 2, 2022 07:18

Fix currentServiceAccount debug message (#2765)

8dfb00a

Signed-off-by: Alexander Greene <greene.al1991@gmail.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 943a726ab1a516bc231e2fe96d13fc2e47bf4448

awgreene changed the title ~~Bz 2080609~~ [release-4.10] Bug 2080609: Fix GRPC CheckRegistryServer function (#2756) May 2, 2022

openshift-ci Bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 2, 2022

openshift-ci Bot requested review from benluddy and perdasilva May 2, 2022 14:20

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2022

This was referenced May 2, 2022

[release-4.10] Bug 2080609: Fix GRPC CheckRegistryServer function (#2756) #296

Closed

Bug 2074612: Fix GRPC CheckRegistryServer function (#2756) #294

Merged

timflannagan approved these changes May 2, 2022

View reviewed changes

openshift-ci Bot assigned timflannagan May 2, 2022

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 2, 2022

openshift-ci Bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 6, 2022

openshift-ci Bot requested a review from jianzhangbjz May 6, 2022 01:01

openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 6, 2022

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 12, 2022

openshift-ci Bot merged commit 1a99acb into openshift:release-4.10 May 12, 2022

Conversation

awgreene commented May 2, 2022

Uh oh!

openshift-ci Bot commented May 2, 2022

Uh oh!

openshift-ci Bot commented May 2, 2022

Uh oh!

openshift-ci Bot commented May 2, 2022

Uh oh!

openshift-bot commented May 2, 2022

Uh oh!

openshift-bot commented May 2, 2022

Uh oh!

openshift-bot commented May 3, 2022

Uh oh!

openshift-bot commented May 3, 2022

Uh oh!

openshift-ci Bot commented May 3, 2022

Uh oh!

openshift-bot commented May 3, 2022

Uh oh!

openshift-bot commented May 3, 2022

Uh oh!

openshift-bot commented May 3, 2022

Uh oh!

openshift-bot commented May 3, 2022

Uh oh!

openshift-bot commented May 3, 2022

Uh oh!

openshift-bot commented May 3, 2022

Uh oh!

openshift-bot commented May 4, 2022

Uh oh!

openshift-bot commented May 4, 2022

Uh oh!

openshift-bot commented May 4, 2022

Uh oh!

openshift-bot commented May 5, 2022

Uh oh!

openshift-ci Bot commented May 5, 2022

Uh oh!

openshift-bot commented May 5, 2022

Uh oh!

openshift-bot commented May 5, 2022

Uh oh!

openshift-bot commented May 5, 2022

Uh oh!

openshift-bot commented May 5, 2022

Uh oh!

openshift-bot commented May 5, 2022

Uh oh!

openshift-bot commented May 5, 2022

Uh oh!

openshift-ci Bot commented May 5, 2022

Uh oh!

openshift-bot commented May 6, 2022

Uh oh!

openshift-ci Bot commented May 6, 2022

Uh oh!

jianzhangbjz commented May 6, 2022

Uh oh!

perdasilva commented May 9, 2022

Uh oh!

perdasilva commented May 12, 2022

Uh oh!

openshift-ci Bot commented May 12, 2022

Uh oh!

awgreene commented Aug 26, 2022

Uh oh!

openshift-cherrypick-robot commented Aug 26, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants