Skip to content

Commit 7bfb8ee

Browse files
committed
[fix] Fixing catalog generation envs and params
1 parent 576560c commit 7bfb8ee

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

make/catalog.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ $(CATALOG_FILE): $(OPM) $(YQ)
1616
@echo Build limitador operator catalog
1717
@echo
1818
@echo BUNDLE_IMG = $(BUNDLE_IMG)
19-
@echo REPLACES = $(REPLACES)
19+
@echo REPLACES_VERSION = $(REPLACES_VERSION)
2020
@echo CHANNELS = $(CHANNELS)
2121
@echo "************************************************************"
2222
@echo
2323
@echo Please check this matches your expectations and override variables if needed.
2424
@echo
25-
$(PROJECT_PATH)/utils/generate-catalog.sh $(OPM) $(YQ) $(BUNDLE_IMG) $(REPLACES) $(CHANNELS) $@
25+
$(PROJECT_PATH)/utils/generate-catalog.sh $(OPM) $(YQ) $(BUNDLE_IMG) $@ $(REPLACES_VERSION) $(CHANNELS)
2626

2727
.PHONY: catalog
2828
catalog: $(OPM) ## Generate catalog content and validate.

utils/generate-catalog.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ set -euo pipefail
77
### CONSTANTS
88
# Used as well in the subscription object
99
DEFAULT_CHANNEL=preview
10+
DEFAULT_REPLACES_VERSION=0.0.0-alpha
1011
###
1112

1213
OPM="${1?:Error \$OPM not set. Bye}"
1314
YQ="${2?:Error \$YQ not set. Bye}"
1415
BUNDLE_IMG="${3?:Error \$BUNDLE_IMG not set. Bye}"
15-
REPLACES="${3?:Error \$REPLACES not set. Bye}"
16-
CHANNELS="${4:-$DEFAULT_CHANNEL}"
17-
CATALOG_FILE="${5?:Error \$CATALOG_FILE not set. Bye}"
16+
CATALOG_FILE="${4?:Error \$CATALOG_FILE not set. Bye}"
17+
REPLACES_VERSION="${5:-$DEFAULT_REPLACES_VERSION}"
18+
CHANNELS="${6:-$DEFAULT_CHANNEL}"
1819

1920
CATALOG_FILE_BASEDIR="$( cd "$( dirname "$(realpath ${CATALOG_FILE})" )" && pwd )"
2021
CATALOG_BASEDIR="$( cd "$( dirname "$(realpath ${CATALOG_FILE_BASEDIR})" )" && pwd )"

0 commit comments

Comments
 (0)