Skip to content

Commit

Permalink
Prepare release v0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jotak committed Oct 25, 2022
1 parent fa989cf commit 69aa0fd
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 21 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
10 changes: 5 additions & 5 deletions bundle/manifests/netobserv-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
7 changes: 2 additions & 5 deletions bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 69aa0fd

Please sign in to comment.