[make] Removing CHANNELS env from workflow. Adding default for catalog

Signed-off-by: dd di cesare <[email protected]>
Kuadrant · Aug 21, 2024 · 9e06527 · 9e06527
1 parent bf82e53
commit 9e06527
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,10 +18,6 @@ on:
         description: Limitador Operator replaced version
         default: 0.0.0-alpha
         type: string
-      channels:
-        description: Bundle and catalog channels, comma separated
-        default: preview
-        type: string
       prerelease:
         description: Is the release a pre release?
         required: false
@@ -53,8 +49,7 @@ jobs:
         run: |
           VERSION=${{ inputs.limitadorOperatorVersion }} \
           LIMITADOR_VERSION=${{ inputs.limitadorVersion }} \
-          REPLACES_VERSION=${{ inputs.replacesVersion }} \
-          CHANNELS=${{ inputs.channels }}
+          REPLACES_VERSION=${{ inputs.replacesVersion }}
           make prepare-release
       - name: Commit and push
         run: |

diff --git a/Makefile b/Makefile
@@ -364,7 +364,7 @@ bundle-push: ## Push the bundle image.
 prepare-release: ## Prepare the manifests for OLM and Helm Chart for a release.
 	$(MAKE) bundle VERSION=$(VERSION) \
 		LIMITADOR_VERSION=$(LIMITADOR_VERSION) \
-		REPLACES_VERSION=$(REPLACES_VERSION) \
+		REPLACES_VERSION=$(REPLACES_VERSION)
 	$(MAKE) helm-build VERSION=$(VERSION) \
 		LIMITADOR_VERSION=$(LIMITADOR_VERSION)
 

diff --git a/make/catalog.mk b/make/catalog.mk
@@ -11,6 +11,8 @@ $(CATALOG_DOCKERFILE): $(OPM)
 	cd $(PROJECT_PATH)/catalog && $(OPM) generate dockerfile limitador-operator-catalog
 catalog-dockerfile: $(CATALOG_DOCKERFILE) ## Generate catalog dockerfile.
 
+CHANNELS ?= preview
+
 $(CATALOG_FILE): $(OPM) $(YQ)
 	@echo "************************************************************"
 	@echo Build limitador operator catalog