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.

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

Bug 1810046: Show CSV icon from default channel #5650

Merged
merged 1 commit into from Jun 5, 2020

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Jun 2, 2020

We were always showing the icon from the first CSV channel in OperatorHub.
We should prefer the icon from the defaultChannel when specified.

/assign @TheRealJon

@spadgett spadgett added this to the v4.6 milestone Jun 2, 2020
@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 Jun 2, 2020
@openshift-ci-robot
Copy link
Contributor

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

In response to this:

Bug 1810046: Show CSV icon from default channel

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 openshift-ci-robot added component/core Related to console core functionality approved Indicates a PR has been approved by an approver from all required OWNERS files. component/olm Related to OLM labels Jun 2, 2020
@spadgett spadgett changed the title Bug 1810046: Show CSV icon from default channel [WIP] Bug 1810046: Show CSV icon from default channel Jun 2, 2020
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2020
@spadgett spadgett changed the title [WIP] Bug 1810046: Show CSV icon from default channel Bug 1810046: Show CSV icon from default channel Jun 2, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2020
@spadgett spadgett changed the title Bug 1810046: Show CSV icon from default channel [WIP] Bug 1810046: Show CSV icon from default channel Jun 3, 2020
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 3, 2020
@spadgett spadgett changed the title [WIP] Bug 1810046: Show CSV icon from default channel Bug 1810046: Show CSV icon from default channel Jun 3, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 3, 2020
We were always showing the icon from the first CSV channel in OperatorHub.
We should prefer the icon from the `defaultChannel` when specified.
@openshift-ci-robot
Copy link
Contributor

@spadgett: This pull request references Bugzilla bug 1810046, which is valid.

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

In response to this:

Bug 1810046: Show CSV icon from default channel

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.

@spadgett
Copy link
Member Author

spadgett commented Jun 5, 2020

I pulled the lazy-load change into a separate PR, #5677.

Copy link
Member

@TheRealJon TheRealJon left a comment

Choose a reason for hiding this comment

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

Just one nit.

/approve
/lgtm

Comment on lines +72 to +74
resourceVersion: [pkg.metadata.name, defaultChannel.name, defaultChannel.currentCSV].join(
'.',
),
Copy link
Member

Choose a reason for hiding this comment

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

nit, should we just use a string template here?

Suggested change
resourceVersion: [pkg.metadata.name, defaultChannel.name, defaultChannel.currentCSV].join(
'.',
),
resourceVersion: `${pkg.metadata.name}.${defaultChannel.name}.${defaultChannel.currentCSV}`,

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 5, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spadgett, TheRealJon

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

@spadgett
Copy link
Member Author

spadgett commented Jun 5, 2020

/cherry-pick release-4.5

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-4.5

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-merge-robot openshift-merge-robot merged commit 9fb8d7e into openshift:master Jun 5, 2020
@openshift-ci-robot
Copy link
Contributor

@spadgett: All pull requests linked via external trackers have merged: openshift/console#5650. Bugzilla bug 1810046 has been moved to the MODIFIED state.

In response to this:

Bug 1810046: Show CSV icon from default channel

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-cherrypick-robot

@spadgett: new pull request created: #5685

In response to this:

/cherry-pick release-4.5

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
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. component/core Related to console core functionality component/olm Related to OLM lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants