From ce1fd947333fa3077ef896f3789da2f09a96763b Mon Sep 17 00:00:00 2001 From: Adam Cattermole Date: Mon, 23 Oct 2023 14:43:07 +0100 Subject: [PATCH] Update channels to be set to stable by default --- Makefile | 6 ++---- bundle/metadata/annotations.yaml | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8e528252..c150987c 100644 --- a/Makefile +++ b/Makefile @@ -38,15 +38,13 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(IMAGE_TAG) # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") -ifneq ($(origin CHANNELS), undefined) +CHANNELS ?= stable 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") -ifneq ($(origin DEFAULT_CHANNEL), undefined) +DEFAULT_CHANNEL ?= stable BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) -endif BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) # Operator manifests (RBAC & CRD) diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 118a56d0..e8e53507 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,7 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: authorino-operator - operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.bundle.channels.v1: stable + operators.operatorframework.io.bundle.channel.default.v1: stable operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3