Skip to content

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

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

Merged
merged 2 commits into from
May 12, 2022

Conversation

awgreene
Copy link
Contributor

@awgreene awgreene commented May 2, 2022

No description provided.

awgreene added 2 commits May 2, 2022 07:18
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 <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7e8e9f77d08d1bf451ce61b7bb2610473e793ded
Signed-off-by: Alexander Greene <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 943a726ab1a516bc231e2fe96d13fc2e47bf4448
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 2, 2022

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

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.

@awgreene awgreene changed the title Bz 2080609 [release-4.10] Bug 2080609: Fix GRPC CheckRegistryServer function (#2756) May 2, 2022
@openshift-ci 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
Copy link
Contributor

openshift-ci bot commented May 2, 2022

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

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 openshift-ci bot requested review from benluddy and perdasilva May 2, 2022 14:20
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 2, 2022

[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

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

/retest-required

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 3, 2022

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

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

/retest-required

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

7 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 5, 2022

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

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

/retest-required

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

5 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 5, 2022

@awgreene: all tests passed!

Full PR test history. Your PR dashboard.

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

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci 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
Copy link
Contributor

openshift-ci bot commented May 6, 2022

@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

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-ci openshift-ci bot requested a review from jianzhangbjz May 6, 2022 01:01
@jianzhangbjz
Copy link
Contributor

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

@openshift-ci 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
@perdasilva
Copy link
Contributor

/backport-risk-assessed

@perdasilva
Copy link
Contributor

/label backport-risk-assessed

@openshift-ci 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 openshift-ci bot merged commit 1a99acb into openshift:release-4.10 May 12, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 12, 2022

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

Bugzilla bug 2080609 has been moved to the MODIFIED state.

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

/cherry-pick release-4.9

@openshift-cherrypick-robot

@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".

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.

stevekuznetsov pushed a commit to stevekuznetsov/operator-framework-olm that referenced this pull request Oct 3, 2023
Signed-off-by: Todd Short <[email protected]>
Upstream-repository: api
Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7
stevekuznetsov pushed a commit to stevekuznetsov/operator-framework-olm that referenced this pull request Oct 4, 2023
Signed-off-by: Todd Short <[email protected]>
Upstream-repository: api
Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7
tmshort added a commit to tmshort/operator-framework-olm that referenced this pull request Oct 5, 2023
Signed-off-by: Todd Short <[email protected]>
Upstream-repository: api
Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7
tmshort added a commit to tmshort/operator-framework-olm that referenced this pull request Oct 5, 2023
Signed-off-by: Todd Short <[email protected]>
Upstream-repository: api
Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7
tmshort added a commit to tmshort/operator-framework-olm that referenced this pull request Oct 9, 2023
Signed-off-by: Todd Short <[email protected]>
Upstream-repository: api
Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7
tmshort added a commit to tmshort/operator-framework-olm that referenced this pull request Oct 9, 2023
Signed-off-by: Todd Short <[email protected]>
Upstream-repository: api
Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7
tmshort added a commit to tmshort/operator-framework-olm that referenced this pull request Oct 11, 2023
Signed-off-by: Todd Short <[email protected]>
Upstream-repository: api
Upstream-commit: 7961b0208d99b3e059a0607663dba547a7e685d7
(cherry picked from commit 55d881b)
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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants