@@ -63,30 +63,31 @@ PACKAGE_NAME_KONFLUX = openperouter-operator
6363CATALOG_TEMPLATE_KONFLUX = .konflux/catalog/catalog-template.in.yaml
6464CATALOG_KONFLUX = .konflux/catalog/$(PACKAGE_NAME_KONFLUX ) /catalog.yaml
6565BUNDLE_NAME_SUFFIX = bundle-4-20
66- PRODUCTION_BUNDLE_NAME = operator-bundle
66+ PRODUCTION_BUNDLE_NAME = bundle
67+ PRODUCTION_NAMESPACE = openshift4-dev-preview-beta
6768
6869# You can use podman or docker as a container engine. Notice that there are some options that might be only valid for one of them.
6970ENGINE ?= docker
7071
7172.PHONY : konflux-validate-catalog-template-bundle # # validate the last bundle entry on the catalog template file
7273konflux-validate-catalog-template-bundle : yq operator-sdk
7374 $(MAKE ) -C $(PROJECT_DIR ) /telco5g-konflux/scripts/catalog konflux-validate-catalog-template-bundle \
74- CATALOG_TEMPLATE_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_TEMPLATE_KONFLUX ) \
75+ CATALOG_TEMPLATE_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_TEMPLATE_KONFLUX ) PRODUCTION_NAMESPACE= $( PRODUCTION_NAMESPACE ) \
7576 YQ=$(YQ ) \
7677 OPERATOR_SDK=$(OPERATOR_SDK ) \
7778 ENGINE=$(ENGINE )
7879
7980.PHONY : konflux-validate-catalog
8081konflux-validate-catalog : opm # # validate the current catalog file
8182 $(MAKE ) -C $(PROJECT_DIR ) /telco5g-konflux/scripts/catalog konflux-validate-catalog \
82- CATALOG_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_KONFLUX ) \
83+ CATALOG_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_KONFLUX ) PRODUCTION_NAMESPACE= $( PRODUCTION_NAMESPACE ) \
8384 OPM=$(OPM )
8485
8586.PHONY : konflux-generate-catalog # # generate a quay.io catalog
8687konflux-generate-catalog : yq opm
8788 $(MAKE ) -C $(PROJECT_DIR ) /telco5g-konflux/scripts/catalog konflux-generate-catalog \
8889 CATALOG_TEMPLATE_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_TEMPLATE_KONFLUX ) \
89- CATALOG_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_KONFLUX ) \
90+ CATALOG_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_KONFLUX ) PRODUCTION_NAMESPACE= $( PRODUCTION_NAMESPACE ) \
9091 PACKAGE_NAME_KONFLUX=$(PACKAGE_NAME_KONFLUX ) \
9192 BUNDLE_BUILDS_FILE=$(PROJECT_DIR ) /.konflux/catalog/bundle.builds.in.yaml \
9293 OPM=$(OPM ) \
@@ -97,7 +98,7 @@ konflux-generate-catalog: yq opm
9798konflux-generate-catalog-production : yq opm
9899 $(MAKE ) -C $(PROJECT_DIR ) /telco5g-konflux/scripts/catalog konflux-generate-catalog-production \
99100 CATALOG_TEMPLATE_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_TEMPLATE_KONFLUX ) \
100- CATALOG_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_KONFLUX ) \
101+ CATALOG_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_KONFLUX ) PRODUCTION_NAMESPACE= $( PRODUCTION_NAMESPACE ) \
101102 PACKAGE_NAME_KONFLUX=$(PACKAGE_NAME_KONFLUX ) \
102103 BUNDLE_NAME_SUFFIX=$(BUNDLE_NAME_SUFFIX ) \
103104 PRODUCTION_BUNDLE_NAME=$(PRODUCTION_BUNDLE_NAME ) \
@@ -122,7 +123,7 @@ konflux-update-tekton-task-refs: ## Update task references in Tekton pipeline fi
122123konflux-compare-catalog : # # Compare generated catalog with upstream FBC image
123124 @echo " Comparing generated catalog with upstream FBC image..."
124125 $(MAKE ) -C $(PROJECT_DIR ) /telco5g-konflux/scripts/catalog konflux-compare-catalog \
125- CATALOG_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_KONFLUX ) \
126+ CATALOG_KONFLUX=$(PROJECT_DIR ) /$(CATALOG_KONFLUX ) PRODUCTION_NAMESPACE= $( PRODUCTION_NAMESPACE ) \
126127 PACKAGE_NAME_KONFLUX=$(PACKAGE_NAME_KONFLUX ) \
127128 UPSTREAM_FBC_IMAGE=quay.io/redhat-user-workloads/telco-5g-tenant/$(PACKAGE_NAME_KONFLUX ) -fbc-4-20:latest
128129
0 commit comments