From 8a44dceaa0f7e91f0bfbedbd7e1880da6c722481 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Wed, 11 Oct 2023 10:49:47 -0400 Subject: [PATCH] build(release): prepare for cryostat 2.4.0 release --- .mergify.yml | 4 ++-- Makefile | 4 ++-- .../cryostat-operator.clusterserviceversion.yaml | 10 +++++----- bundle/tests/scorecard/config.yaml | 4 ++-- config/manager/kustomization.yaml | 2 +- .../bases/cryostat-operator.clusterserviceversion.yaml | 2 +- config/scorecard/patches/custom.config.yaml | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 3f89a7b6..46cd7044 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,12 +1,12 @@ pull_request_rules: - - name: backport patches to cryostat-v2.3 branch + - name: backport patches to cryostat-v2.4 branch conditions: - base=main - label=backport actions: backport: branches: - - cryostat-v2.3 + - cryostat-v2.4 assignees: - "{{ author }}" - name: auto label PRs from reviewers diff --git a/Makefile b/Makefile index 488ce472..3bf985d5 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ OS = $(shell go env GOOS) ARCH = $(shell go env GOARCH) # Current Operator version -IMAGE_VERSION ?= 2.4.0-dev +IMAGE_VERSION ?= 2.5.0-dev BUNDLE_VERSION ?= $(IMAGE_VERSION) DEFAULT_NAMESPACE ?= quay.io/cryostat IMAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE) @@ -91,7 +91,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 ?= 2.4.0-$(shell date -u '+%Y%m%d%H%M%S') +CUSTOM_SCORECARD_VERSION ?= 2.5.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 diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml index 83c52ad3..3e368e05 100644 --- a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml @@ -53,8 +53,8 @@ metadata: ] capabilities: Seamless Upgrades categories: Monitoring, Developer Tools - containerImage: quay.io/cryostat/cryostat-operator:2.4.0-dev - createdAt: "2023-09-28T14:25:20Z" + containerImage: quay.io/cryostat/cryostat-operator:2.5.0-dev + createdAt: "2023-10-11T14:49:05Z" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { @@ -79,7 +79,7 @@ metadata: operatorframework.io/arch.amd64: supported operatorframework.io/arch.arm64: supported operatorframework.io/os.linux: supported - name: cryostat-operator.v2.4.0-dev + name: cryostat-operator.v2.5.0-dev namespace: placeholder spec: apiservicedefinitions: {} @@ -1084,7 +1084,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/cryostat/cryostat-operator:2.4.0-dev + image: quay.io/cryostat/cryostat-operator:2.5.0-dev imagePullPolicy: Always livenessProbe: httpGet: @@ -1199,4 +1199,4 @@ spec: name: grafana - image: quay.io/cryostat/cryostat-reports:latest name: reports - version: 2.4.0-dev + version: 2.5.0-dev diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index f0ad3047..ba7284c7 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -69,7 +69,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - operator-install - image: quay.io/cryostat/cryostat-operator-scorecard:2.4.0-20230824004852 + image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20231011144522 labels: suite: cryostat test: operator-install @@ -79,7 +79,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-cr - image: quay.io/cryostat/cryostat-operator-scorecard:2.4.0-20230824004852 + image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20231011144522 labels: suite: cryostat test: cryostat-cr diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index c105afc0..116f3c81 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/cryostat/cryostat-operator - newTag: 2.4.0-dev + newTag: 2.5.0-dev diff --git a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml index 6fd2a6d1..7b0ccd27 100644 --- a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml @@ -4,7 +4,7 @@ metadata: annotations: capabilities: Seamless Upgrades categories: Monitoring, Developer Tools - containerImage: quay.io/cryostat/cryostat-operator:2.4.0-dev + containerImage: quay.io/cryostat/cryostat-operator:2.5.0-dev description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml index 6d915258..786cf388 100644 --- a/config/scorecard/patches/custom.config.yaml +++ b/config/scorecard/patches/custom.config.yaml @@ -8,7 +8,7 @@ entrypoint: - cryostat-scorecard-tests - operator-install - image: "quay.io/cryostat/cryostat-operator-scorecard:2.4.0-20230824004852" + image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20231011144522" labels: suite: cryostat test: operator-install @@ -18,7 +18,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-cr - image: "quay.io/cryostat/cryostat-operator-scorecard:2.4.0-20230824004852" + image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20231011144522" labels: suite: cryostat test: cryostat-cr