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

feat: switch to file-based OLM catalogs #195

Merged
merged 1 commit into from
Sep 20, 2022

Conversation

sthaha
Copy link
Collaborator

@sthaha sthaha commented Sep 16, 2022

The Catalog index yaml file for the new file-based catalog will be maintained in the olm-catalog branch. The PR introduces the changes needed to generate new catalog index entry for new releases to the development, candidate, and the stable channel and to push the updated index to the olm-catalog git branch.

To switch to new file-based OLM catalogs, following changes have been made

  • upgrade to newer version of operator-sdk tools (operator-sdk, olm)

  • Generate catalog for existing 0.0.13 bundle by

  • Modify GitHub workflow to adapt to the new file-based catalog

JIRA: https://issues.redhat.com/browse/MON-2791

Signed-off-by: Sunil Thaha sthaha@redhat.com

@sthaha
Copy link
Collaborator Author

sthaha commented Sep 16, 2022

NOTE This requires the olm-catalog pr #194 to be merged first so that when this PR merges, olm-publish action that is run after a commit merges to main runs fine is able to publish catalog images to quay.

The olm-publish action makes the assumption that the branch - olm-catalog exists and that it contains the catalog index.

cc: @jan--f @simonpasquier

# make initiate-release conflicts with the previous bundle created for
# development branch, so the version in main takes precedence over the
# one in olm-catalog branch
git merge -Xours origin/olm-catalog -m "merge olm-catalog branch"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does the merge message need to conform to the commit linter expectations?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch, fixed 🤞

The Catalog index yaml file for the new file-based catalog will be
maintained in the olm-catalog branch. The PR introduces the changes
needed to generate new catalog index entry for new releases to the
development, candidate, and the stable channel and to push the updated
index to the olm-catalog git branch.

 To switch to new file-based OLM catalogs, following changes have been made

  * upgrade to newer version of operator-sdk tools (operator-sdk, olm)

  * Generate catalog for existing 0.0.13 bundle by
    * creating new catalog index dockerfile
    * adding package definition for observability-operator
    * adding channel definitions for all 3 channels
    see: rhobs#194

  * Modify GitHub workflow to adapt to the new file-based catalog

JIRA: https://issues.redhat.com/browse/MON-2791

Signed-off-by: Sunil Thaha <sthaha@redhat.com>
@sthaha sthaha force-pushed the feat-olm-catalog-2791-ctg-branch branch from d8dfe58 to d953460 Compare September 20, 2022 08:19
@jan--f jan--f merged commit f3db3e2 into rhobs:main Sep 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants