-
Notifications
You must be signed in to change notification settings - Fork 59
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
chore: new file-based-catalog based on 0.0.13 #194
Conversation
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 <[email protected]>
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 <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just two small things want to raise.
olm/update-channels.sh
Outdated
local channels=$1; shift | ||
local bundle=$1; shift |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
local channels=$1; shift | |
local bundle=$1; shift | |
local channels="$1"; shift | |
local bundle="$1"; shift |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I have fixed and updated the commit.
@@ -8,6 +8,7 @@ IMAGE_BASE ?= observability-operator | |||
|
|||
VERSION ?= $(shell cat VERSION) | |||
OPERATOR_IMG = $(IMAGE_BASE):$(VERSION) | |||
OPERATOR_BUNDLE=observability-operator.v$(VERSION) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OPERATOR_BUNDLE=observability-operator.v$(VERSION) | |
OPERATOR_BUNDLE=observability-operator-v$(VERSION) |
Isn't this a more common way of adding a version to the name? I went looking for examples and found https://olm.operatorframework.io/docs/best-practices/channel-naming/ which also seems to suggest name-version
. Might be less surprising for anyone who tries to parse this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am a bit confused about this comment.
We aren't changing the existing channel names stable, candidate, development
in this patch.
If it is about the change proposed, that wouldn't work since opm render <bundle-image>
uses the format in PR. E.g.
❯ opm render quay.io/rhobs/observability-operator-bundle:0.0.13 --output=yaml | ag '^name:'
name: observability-operator.v0.0.13
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it. I just pointed it out cause the name format looked odd to me. But since its not under our control I'll merge this.
This PR creates a new file-based OLM catalog index based on 0.0.13 bundle that is already published to quay.io This is achieved by running ``` make catalog-image VERSION=0.0.13 IMAGE_BASE=quay.io/rhobs/observability-operator ``` Signed-off-by: Sunil Thaha <[email protected]>
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 <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
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: #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 <[email protected]> Signed-off-by: Sunil Thaha <[email protected]>
This PR creates a new file-based OLM catalog index based on 0.0.13 bundle
that is already published to quay.io
This is achieved by running
Signed-off-by: Sunil Thaha [email protected]