From d7d83d8f0f9afd496761c57642648d275ad848d4 Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Mon, 23 Jan 2023 21:06:49 +0100 Subject: [PATCH] Use latest channel --- Makefile | 4 ++-- bundle.Dockerfile | 4 ++-- .../manifests/netobserv-operator.clusterserviceversion.yaml | 2 +- bundle/metadata/annotations.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8a3b00758..ba77ea8d2 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ PORT_FWD ?= true # 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") -CHANNELS := v1.0.x +CHANNELS := latest,v1.0.x ifneq ($(origin CHANNELS), undefined) BUNDLE_CHANNELS := --channels=$(CHANNELS) endif @@ -36,7 +36,7 @@ endif # To re-generate a bundle for any other default channel without changing the default setup, you can: # - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable) # - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable") -DEFAULT_CHANNEL := v1.0.x +DEFAULT_CHANNEL := latest ifneq ($(origin DEFAULT_CHANNEL), undefined) BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) endif diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 33356c7a3..54d638120 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=netobserv-operator -LABEL operators.operatorframework.io.bundle.channels.v1=v1.0.x -LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.0.x +LABEL operators.operatorframework.io.bundle.channels.v1=latest,v1.0.x +LABEL operators.operatorframework.io.bundle.channel.default.v1=latest LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.3 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index 4cc7e70f3..7f71d8314 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -169,7 +169,7 @@ metadata: categories: Monitoring console.openshift.io/plugins: '["netobserv-plugin"]' containerImage: quay.io/netobserv/network-observability-operator:1.0.1-rc0 - createdAt: "2023-01-23T18:20:16Z" + createdAt: "2023-01-23T20:05:41Z" description: Network flows collector and monitoring solution operators.operatorframework.io/builder: operator-sdk-v1.25.3 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 7cf38f631..de3993219 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,8 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: netobserv-operator - operators.operatorframework.io.bundle.channels.v1: v1.0.x - operators.operatorframework.io.bundle.channel.default.v1: v1.0.x + operators.operatorframework.io.bundle.channels.v1: latest,v1.0.x + operators.operatorframework.io.bundle.channel.default.v1: latest operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.3 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3