From 69aa0fd78123f338514b50719b432f1838198ad4 Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Tue, 25 Oct 2022 11:15:27 +0200 Subject: [PATCH] Prepare release v0.2.0 --- Makefile | 2 ++ RELEASE.md | 8 ++++---- bundle.Dockerfile | 8 ++------ .../netobserv-operator.clusterserviceversion.yaml | 10 +++++----- bundle/metadata/annotations.yaml | 7 ++----- config/manager/kustomization.yaml | 2 +- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 28130856f..0248587c3 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,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 := v0.2.x ifneq ($(origin CHANNELS), undefined) BUNDLE_CHANNELS := --channels=$(CHANNELS) endif @@ -34,6 +35,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 := v0.2.x ifneq ($(origin DEFAULT_CHANNEL), undefined) BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) endif diff --git a/RELEASE.md b/RELEASE.md index ad62b1120..9a5ebdc8a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -33,7 +33,7 @@ Once all sub-components are released (or have a release candidate), we can proce # Previous operator version previous="v0.1.4" # Set desired operator version - CAREFUL, no leading "v" here -version="0.1.5" +version="0.2.0" # Set console plugin released version plgv="v0.1.5" # Set flowlogs-pipeline released version @@ -91,8 +91,8 @@ Before publishing, we should check that upgrading the operator from a previous v ```bash # NOTE: on my last try, I needed to pass an index-image that corresponds to the operator-sdk version. This is likely due to a bug and should be eventually removed (cf https://github.com/operator-framework/operator-sdk/issues/5980) -operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:$previous --index-image quay.io/operator-framework/opm:v1.22 -operator-sdk run bundle-upgrade quay.io/netobserv/network-observability-operator-bundle:$vv +operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:$previous --index-image quay.io/operator-framework/opm:v1.22 --timeout 5m +operator-sdk run bundle-upgrade quay.io/netobserv/network-observability-operator-bundle:$vv --timeout 5m ``` Note: currently, [seamless upgrade](https://sdk.operatorframework.io/docs/overview/operator-capabilities/#level-2---seamless-upgrades) is not fully supported because an existing custom resource needs first to be deleted before the operator is upgraded. See also: https://issues.redhat.com/browse/NETOBSERV-521. @@ -120,7 +120,7 @@ After having cloned or updated these repo, copy the bundle content: # Here, set correct paths and new version path_k8s="../community-operators" path_okd="../community-operators-prod" -version="0.1.4" +version="0.2.0" mkdir -p $path_k8s/operators/netobserv-operator/$version mkdir -p $path_okd/operators/netobserv-operator/$version diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 2078bc634..b9d0b18cb 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,16 +5,12 @@ 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=alpha +LABEL operators.operatorframework.io.bundle.channels.v1=v0.2.x +LABEL operators.operatorframework.io.bundle.channel.default.v1=v0.2.x LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.2 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 -# Labels for testing. -LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 -LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ - # Copy files to locations specified by labels. COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ -COPY bundle/tests/scorecard /tests/scorecard/ diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index 21eb2a340..3a60c7bf4 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -141,13 +141,13 @@ metadata: capabilities: Basic Install categories: Monitoring console.openshift.io/plugins: '["netobserv-plugin"]' - containerImage: quay.io/netobserv/network-observability-operator:0.1.5 - createdAt: "2022-10-21T15:13:44Z" + containerImage: quay.io/netobserv/network-observability-operator:0.2.0 + createdAt: "2022-10-25T09:40:09Z" description: Network flows collector and monitoring solution operators.operatorframework.io/builder: operator-sdk-v1.22.2 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/netobserv/network-observability-operator - name: netobserv-operator.v0.1.5 + name: netobserv-operator.v0.2.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -427,7 +427,7 @@ spec: - --leader-elect command: - /manager - image: quay.io/netobserv/network-observability-operator:0.1.5 + image: quay.io/netobserv/network-observability-operator:0.2.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -529,4 +529,4 @@ spec: name: Red Hat url: https://www.redhat.com replaces: netobserv-operator.v0.1.4 - version: 0.1.5 + version: 0.2.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index c346d464b..208597072 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,11 +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: alpha + operators.operatorframework.io.bundle.channels.v1: v0.2.x + operators.operatorframework.io.bundle.channel.default.v1: v0.2.x operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.2 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 - - # Annotations for testing. - operators.operatorframework.io.test.mediatype.v1: scorecard+v1 - operators.operatorframework.io.test.config.v1: tests/scorecard/ diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 57dba6ad8..baa5beba0 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,6 +13,6 @@ kind: Kustomization images: - name: controller newName: quay.io/netobserv/network-observability-operator - newTag: 0.1.5 + newTag: 0.2.0 commonLabels: app: netobserv-operator