Skip to content

fix: catalog multi-channel support and upgrade metadata #172

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

Merged
openshift-merge-bot merged 2 commits into from
Jul 2, 2026
Merged

fix: catalog multi-channel support and upgrade metadata #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76bda78
fix: catalog multi-channel support and upgrade metadata
clobrano Jun 26, 2026
e3a51bc
Validate DEFAULT_CHANNEL is present in CHANNELS
clobrano Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,6 @@ tags
.vscode/*
.history
# End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode

catalog/
catalog.Dockerfile
45 changes: 36 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,22 @@ IMAGE_TAG = v$(VERSION)
endif
export IMAGE_TAG

CHANNELS = stable
CHANNELS ?= stable
export CHANNELS
DEFAULT_CHANNEL = stable
DEFAULT_CHANNEL ?= stable
export DEFAULT_CHANNEL

# Validate DEFAULT_CHANNEL is in CHANNELS
# When CHANNELS contains comma-separated values (e.g., "stable,beta"), we need to convert
# commas to spaces for filter to match. We use a variable for the comma because Make treats
# commas as function argument delimiters, causing $(subst ,, ,$(CHANNELS)) to misparse.
comma := ,
ifneq (,$(DEFAULT_CHANNEL))
ifeq (,$(filter $(DEFAULT_CHANNEL),$(subst $(comma), ,$(CHANNELS))))
$(error DEFAULT_CHANNEL "$(DEFAULT_CHANNEL)" must be present in CHANNELS "$(CHANNELS)")
endif
endif

# VERSION defines the project version for the bundle.
# Update this value when you upgrade the version of your project.
# To re-generate a bundle for another specific version without changing the standard setup, you can:
Expand All @@ -55,6 +66,7 @@ export DEFAULT_CHANNEL
CI_VERSION := 9.9.9-dummy
VERSION ?= $(DEFAULT_VERSION)
PREVIOUS_VERSION ?= $(DEFAULT_VERSION)
SKIP_RANGE_LOWER ?=
export VERSION

# CHANNELS define the bundle channels used in the bundle.
Expand Down Expand Up @@ -423,14 +435,29 @@ CATALOG_DIR := catalog
CATALOG_DOCKERFILE := ${CATALOG_DIR}.Dockerfile
CATALOG_INDEX := $(CATALOG_DIR)/index.yaml

# Add olm.channel entries for each channel in CHANNELS.
# For development version (0.0.1), omit replaces and skipRange to avoid OLM catalog validation errors.
.PHONY: add_channel_entry_for_the_bundle
add_channel_entry_for_the_bundle:
@echo "---" >> ${CATALOG_INDEX}
@echo "schema: olm.channel" >> ${CATALOG_INDEX}
@echo "package: ${OPERATOR_NAME}" >> ${CATALOG_INDEX}
@echo "name: ${CHANNELS}" >> ${CATALOG_INDEX}
@echo "entries:" >> ${CATALOG_INDEX}
@echo " - name: ${OPERATOR_NAME}.v${VERSION}" >> ${CATALOG_INDEX}
@for channel in $(shell echo ${CHANNELS} | tr ',' ' '); do \
echo "---" >> ${CATALOG_INDEX}; \
echo "schema: olm.channel" >> ${CATALOG_INDEX}; \
echo "package: ${OPERATOR_NAME}" >> ${CATALOG_INDEX}; \
echo "name: $$channel" >> ${CATALOG_INDEX}; \
echo "entries:" >> ${CATALOG_INDEX}; \
echo " - name: ${OPERATOR_NAME}.v${VERSION}" >> ${CATALOG_INDEX}; \
\
if [ -n "${PREVIOUS_VERSION}" ] && [ "${VERSION}" != "${DEFAULT_VERSION}" ] && [ "${PREVIOUS_VERSION}" != "${DEFAULT_VERSION}" ]; then \
echo " replaces: ${OPERATOR_NAME}.v${PREVIOUS_VERSION}" >> ${CATALOG_INDEX}; \
fi; \
if [ -n "${SKIP_RANGE_LOWER}" ] && [ "${VERSION}" != "${DEFAULT_VERSION}" ] && [ "${VERSION}" != "${SKIP_RANGE_LOWER}" ]; then \
if ! printf '%s\n' "${SKIP_RANGE_LOWER}" "${VERSION}" | sort -V -C 2>/dev/null; then \
echo "Error: VERSION (${VERSION}) must be greater than SKIP_RANGE_LOWER (${SKIP_RANGE_LOWER})"; \
exit 1; \
fi; \
echo " skipRange: '>=${SKIP_RANGE_LOWER} <${VERSION}'" >> ${CATALOG_INDEX}; \
fi; \
done

.PHONY: build-tools
build-tools: ## Download & build all the tools locally if necessary.
Expand All @@ -446,7 +473,7 @@ catalog-build: opm ## Build a file-based catalog image.
@mkdir -p ${CATALOG_DIR}
$(OPM) generate dockerfile ${CATALOG_DIR}
$(OPM) init ${OPERATOR_NAME} \
--default-channel=${CHANNELS} \
--default-channel=${DEFAULT_CHANNEL} \
Comment thread
razo7 marked this conversation as resolved.
--description=./README.md \
--icon=${BLUE_ICON_PATH} \
--output yaml \
Expand Down
Loading