From ec4c1c794e36bf40493ac133f93f79449d8b6b2c Mon Sep 17 00:00:00 2001 From: Eguzki Astiz Lezaun Date: Tue, 24 Sep 2024 18:13:17 +0200 Subject: [PATCH] Makefile: default CHANNELS doc/development.md: channels doc on custom bundle section Signed-off-by: Eguzki Astiz Lezaun --- Makefile | 3 +-- doc/development.md | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b9f6f6c..28bf008 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,8 @@ VERSION ?= 0.0.0 # To re-generate a bundle for other specific channels without changing the standard setup, you can: # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable) # - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable") -ifneq ($(origin CHANNELS), undefined) +CHANNELS ?= alpha BUNDLE_CHANNELS := --channels=$(CHANNELS) -endif # DEFAULT_CHANNEL defines the default channel used in the bundle. # Add a new line here if you would like to change its default config. (E.g DEFAULT_CHANNEL = "stable") diff --git a/doc/development.md b/doc/development.md index 370c073..233a3ae 100644 --- a/doc/development.md +++ b/doc/development.md @@ -79,13 +79,17 @@ The `make bundle` target accepts the following variables: | `IMG` | Operator image URL | `quay.io/kuadrant/limitador-operator:latest` | | | `VERSION` | Bundle version | `0.0.0` | | | `RELATED_IMAGE_LIMITADOR` | Limitador bundle URL | `quay.io/kuadrant/limitador:latest` | `LIMITADOR_VERSION` var could be use to build this URL providing the tag | +| `CHANNELS` | Bundle channels used in the bundle, comma separated | `alpha` | +| `DEFAULT_CHANNEL` | The default channel used in the bundle | `alpha` | * Build the bundle manifests ```bash make bundle [IMG=quay.io/kuadrant/limitador-operator:latest] \ [VERSION=0.0.0] \ - [RELATED_IMAGE_LIMITADOR=quay.io/kuadrant/limitador:latest] + [RELATED_IMAGE_LIMITADOR=quay.io/kuadrant/limitador:latest] \ + [CHANNELS=alpha] \ + [DEFAULT_CHANNEL=alpha] ``` * Build the bundle image from the manifests