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

internal/pkg/scaffold/olm-catalog: do not add duplicate channels, use operator-name #1693

Merged
merged 5 commits into from
Aug 15, 2019
Merged

internal/pkg/scaffold/olm-catalog: do not add duplicate channels, use operator-name #1693

merged 5 commits into from
Aug 15, 2019

Conversation

estroz
Copy link
Member

@estroz estroz commented Jul 17, 2019 •
edited
Loading

Description of the change:

  • ensure channel does not exist before appending to channels.
  • use OperatorName instead of ProjectName to match CSV scaffold behaviour.

Motivation for the change: package manifests should not have duplicate channel names.

@estroz estroz added the olm-integration Issue relates to the OLM integration label Jul 17, 2019
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 17, 2019
@estroz
Copy link
Member Author

estroz commented Jul 18, 2019

/test marker

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 19, 2019
@estroz estroz changed the title internal/pkg/scaffold/olm-catalog: do not add duplicate channels internal/pkg/scaffold/olm-catalog: do not add duplicate channels, use operator-name Jul 22, 2019
@estroz estroz added the kind/bug Categorizes issue or PR as related to a bug. label Jul 22, 2019
joelanford
joelanford approved these changes Aug 15, 2019
View reviewed changes
Copy link
Member

@joelanford joelanford left a comment

Choose a reason for hiding this comment

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

One nit. Otherwise LGTM

internal/pkg/scaffold/olm-catalog/package_manifest.go Outdated Show resolved Hide resolved
@joelanford
Copy link
Member

@estroz Can you also update the CHANGELOG?

@estroz
Copy link
Member Author

estroz commented Aug 15, 2019

/test marker

@estroz estroz requested a review from hasbro17 August 15, 2019 17:20
hasbro17
hasbro17 approved these changes Aug 15, 2019
View reviewed changes
Copy link
Contributor

@hasbro17 hasbro17 left a comment

Choose a reason for hiding this comment

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

LGTM

@estroz
Copy link
Member Author

estroz commented Aug 15, 2019

/retest

1 similar comment
@estroz
Copy link
Member Author

estroz commented Aug 15, 2019

/retest

@estroz estroz merged commit 8c0bafb into operator-framework:master Aug 15, 2019
@estroz estroz deleted the package-manifest-updates branch August 15, 2019 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joelanford joelanford joelanford approved these changes

@hasbro17 hasbro17 hasbro17 approved these changes

@jmrodri jmrodri Awaiting requested review from jmrodri

@fabianvf fabianvf Awaiting requested review from fabianvf

@AlexNPavel AlexNPavel Awaiting requested review from AlexNPavel

@lilic lilic Awaiting requested review from lilic

@theishshah theishshah Awaiting requested review from theishshah

Assignees
No one assigned
Labels
kind/bug Categorizes issue or PR as related to a bug. olm-integration Issue relates to the OLM integration size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@estroz @joelanford @hasbro17 @openshift-ci-robot