Skip to content

Commit

Permalink
chore(release): prepare for release (#863)
Browse files Browse the repository at this point in the history
* chore(release): update mergify config

* chore(release): bump version to 4.0.0-dev

* Update containerImage annotation

---------

Co-authored-by: Elliott Baron <ebaron@redhat.com>
  • Loading branch information
andrewazores and ebaron committed Jun 6, 2024
1 parent d5f4a39 commit f4565a3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
pull_request_rules:
- name: backport patches to cryostat-v2.4 branch
- name: backport patches to cryostat-v3.0 branch
conditions:
- base=main
- label=backport
actions:
backport:
branches:
- cryostat-v2.4
- cryostat-v3.0
assignees:
- "{{ author }}"
- name: auto label PRs from reviewers
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ OS = $(shell go env GOOS)
ARCH = $(shell go env GOARCH)

# Current Operator version
export OPERATOR_VERSION ?= 3.0.0-dev
export OPERATOR_VERSION ?= 4.0.0-dev
IMAGE_VERSION ?= $(OPERATOR_VERSION)
BUNDLE_VERSION ?= $(IMAGE_VERSION)
DEFAULT_NAMESPACE ?= quay.io/cryostat
Expand Down Expand Up @@ -62,7 +62,7 @@ export APP_NAME ?= Cryostat
# Images used by the operator
CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
CORE_NAME ?= cryostat
CORE_VERSION ?= 3.0.0-snapshot
CORE_VERSION ?= 4.0.0-snapshot
export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
OAUTH2_PROXY_NAMESPACE ?= quay.io/oauth2-proxy
OAUTH2_PROXY_NAME ?= oauth2-proxy
Expand Down Expand Up @@ -109,7 +109,7 @@ ENVTEST_K8S_VERSION ?= 1.26
# See: https://github.com/operator-framework/operator-sdk/pull/4762
#
# Suffix is the timestamp of the image build, compute with: date -u '+%Y%m%d%H%M%S'
CUSTOM_SCORECARD_VERSION ?= 3.0.0-$(shell date -u '+%Y%m%d%H%M%S')
CUSTOM_SCORECARD_VERSION ?= 4.0.0-$(shell date -u '+%Y%m%d%H%M%S')
export CUSTOM_SCORECARD_IMG ?= $(IMAGE_TAG_BASE)-scorecard:$(CUSTOM_SCORECARD_VERSION)

DEPLOY_NAMESPACE ?= cryostat-operator-system
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
capabilities: Seamless Upgrades
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:3.0.0-dev
containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand Down

0 comments on commit f4565a3

Please sign in to comment.