Skip to content

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

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
Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #294

/assign awgreene

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Apr 30, 2022
Merged
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 30, 2022

@openshift-cherrypick-robot: Bugzilla bug 2074612 has been cloned as Bugzilla bug 2080609. Retitling PR to link against new bug.
/retitle [release-4.10] Bug 2080609: Fix GRPC CheckRegistryServer function (#2756)

In response to this:

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

openshift-ci bot commented Apr 30, 2022

@openshift-cherrypick-robot: 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 hasbro17 and timflannagan April 30, 2022 13:07
awgreene
awgreene reviewed Apr 30, 2022
View reviewed changes
staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
serviceAccountName := source.ServiceAccount().GetName()
serviceAccount, err := c.Lister.CoreV1().ServiceAccountLister().ServiceAccounts(source.GetNamespace()).Get(serviceAccountName)
if err != nil {
logrus.WithField("service", serviceAccount).Debug("couldn't find service in cache")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
logrus.WithField("service", serviceAccount).Debug("couldn't find service in cache")
logrus.WithField("serviceAccount", serviceAccount).Debug("couldn't find serviceAccount in cache")

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep - made this same comment in the wrong PR. Should we just manually create a 4.10 PR so we can add that second commit?

Copy link
Contributor

Choose a reason for hiding this comment

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

That's what I'm thinking.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, done in Created #298

@awgreene
Fix GRPC CheckRegistryServer function (#2756)
ae83d92 
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
@openshift-cherrypick-robot openshift-cherrypick-robot force-pushed the cherry-pick-294-to-release-4.10 branch from 5eb6c57 to ae83d92 Compare May 2, 2022 14:13
@awgreene
Copy link
Contributor

awgreene commented May 2, 2022 •
edited
Loading

Going to manually create a backport so this fix is included.
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 2, 2022
@openshift-ci openshift-ci bot closed this May 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 2, 2022

@awgreene: Closed this PR.

In response to this:

/close

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

openshift-ci bot commented May 2, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
To complete the pull request process, please ask for approval from awgreene after the PR has been reviewed.

The full list of commands accepted by this bot can be found 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
Copy link
Contributor

openshift-ci bot commented May 2, 2022

@openshift-cherrypick-robot: 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.

@awgreene
Copy link
Contributor

awgreene commented May 2, 2022

Created #298 for the 4.10 backport.

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

@awgreene awgreene awgreene left review comments

@hasbro17 hasbro17 Awaiting requested review from hasbro17

@timflannagan timflannagan Awaiting requested review from timflannagan

Assignees

@awgreene awgreene

Labels
bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@openshift-cherrypick-robot @awgreene @timflannagan