Skip to content

Commit f766233

Browse files
authored
chore(release): prepare 2.4.0 release (#693)
* chore(release): prepare 2.4.0 release * fixup! chore(release): prepare 2.4.0 release
1 parent 4c6260e commit f766233

File tree

10 files changed

+36
-34
lines changed

10 files changed

+36
-34
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OS = $(shell go env GOOS)
88
ARCH = $(shell go env GOARCH)
99

1010
# Current Operator version
11-
export OPERATOR_VERSION ?= 2.4.0-dev
11+
export OPERATOR_VERSION ?= 2.4.0
1212
IMAGE_VERSION ?= $(OPERATOR_VERSION)
1313
BUNDLE_VERSION ?= $(IMAGE_VERSION)
1414
DEFAULT_NAMESPACE ?= quay.io/cryostat
@@ -63,19 +63,19 @@ export APP_NAME ?= Cryostat
6363
# Images used by the operator
6464
CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
6565
CORE_NAME ?= cryostat
66-
CORE_VERSION ?= 2.4.0-snapshot
66+
CORE_VERSION ?= 2.4.0
6767
export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
6868
DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
6969
DATASOURCE_NAME ?= jfr-datasource
70-
DATASOURCE_VERSION ?= 2.4.0-snapshot
70+
DATASOURCE_VERSION ?= 2.4.0
7171
export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
7272
GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
7373
GRAFANA_NAME ?= cryostat-grafana-dashboard
74-
GRAFANA_VERSION ?= cryostat-v2.4
74+
GRAFANA_VERSION ?= 2.4.0
7575
export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
7676
REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
7777
REPORTS_NAME ?= cryostat-reports
78-
REPORTS_VERSION ?= 2.4.0-snapshot
78+
REPORTS_VERSION ?= 2.4.0
7979
export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)
8080

8181
CERT_MANAGER_VERSION ?= 1.11.5

bundle.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
55
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=cryostat-operator
8-
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
8+
LABEL operators.operatorframework.io.bundle.channels.v1=stable
9+
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
910
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
1011
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1112
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

bundle/manifests/cryostat-operator.clusterserviceversion.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ metadata:
5353
]
5454
capabilities: Seamless Upgrades
5555
categories: Monitoring, Developer Tools
56-
containerImage: quay.io/cryostat/cryostat-operator:2.4.0-dev
57-
createdAt: "2023-11-14T18:45:10Z"
56+
containerImage: quay.io/cryostat/cryostat-operator:2.4.0
57+
createdAt: "2023-12-08T18:53:01Z"
5858
description: JVM monitoring and profiling tool
5959
operatorframework.io/initialization-resource: |-
6060
{
@@ -79,7 +79,7 @@ metadata:
7979
operatorframework.io/arch.amd64: supported
8080
operatorframework.io/arch.arm64: supported
8181
operatorframework.io/os.linux: supported
82-
name: cryostat-operator.v2.4.0-dev
82+
name: cryostat-operator.v2.4.0
8383
namespace: placeholder
8484
spec:
8585
apiservicedefinitions: {}
@@ -1097,13 +1097,13 @@ spec:
10971097
- /manager
10981098
env:
10991099
- name: RELATED_IMAGE_CORE
1100-
value: quay.io/cryostat/cryostat:2.4.0-snapshot
1100+
value: quay.io/cryostat/cryostat:2.4.0
11011101
- name: RELATED_IMAGE_DATASOURCE
1102-
value: quay.io/cryostat/jfr-datasource:2.4.0-snapshot
1102+
value: quay.io/cryostat/jfr-datasource:2.4.0
11031103
- name: RELATED_IMAGE_GRAFANA
1104-
value: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4
1104+
value: quay.io/cryostat/cryostat-grafana-dashboard:2.4.0
11051105
- name: RELATED_IMAGE_REPORTS
1106-
value: quay.io/cryostat/cryostat-reports:2.4.0-snapshot
1106+
value: quay.io/cryostat/cryostat-reports:2.4.0
11071107
- name: WATCH_NAMESPACE
11081108
valueFrom:
11091109
fieldRef:
@@ -1112,8 +1112,8 @@ spec:
11121112
valueFrom:
11131113
fieldRef:
11141114
fieldPath: metadata.namespace
1115-
image: quay.io/cryostat/cryostat-operator:2.4.0-dev
1116-
imagePullPolicy: Always
1115+
image: quay.io/cryostat/cryostat-operator:2.4.0
1116+
imagePullPolicy: IfNotPresent
11171117
livenessProbe:
11181118
httpGet:
11191119
path: /healthz
@@ -1219,12 +1219,12 @@ spec:
12191219
provider:
12201220
name: The Cryostat Community
12211221
relatedImages:
1222-
- image: quay.io/cryostat/cryostat:2.4.0-snapshot
1222+
- image: quay.io/cryostat/cryostat:2.4.0
12231223
name: core
1224-
- image: quay.io/cryostat/jfr-datasource:2.4.0-snapshot
1224+
- image: quay.io/cryostat/jfr-datasource:2.4.0
12251225
name: datasource
1226-
- image: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4
1226+
- image: quay.io/cryostat/cryostat-grafana-dashboard:2.4.0
12271227
name: grafana
1228-
- image: quay.io/cryostat/cryostat-reports:2.4.0-snapshot
1228+
- image: quay.io/cryostat/cryostat-reports:2.4.0
12291229
name: reports
1230-
version: 2.4.0-dev
1230+
version: 2.4.0

bundle/metadata/annotations.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ annotations:
44
operators.operatorframework.io.bundle.manifests.v1: manifests/
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: cryostat-operator
7-
operators.operatorframework.io.bundle.channels.v1: alpha
7+
operators.operatorframework.io.bundle.channels.v1: stable
8+
operators.operatorframework.io.bundle.channel.default.v1: stable
89
operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0
910
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1011
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

config/default/image_pull_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ spec:
88
spec:
99
containers:
1010
- name: manager
11-
imagePullPolicy: "Always"
11+
imagePullPolicy: "IfNotPresent"

config/default/image_tag_patch.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ spec:
1010
- name: manager
1111
env:
1212
- name: RELATED_IMAGE_CORE
13-
value: "quay.io/cryostat/cryostat:2.4.0-snapshot"
13+
value: "quay.io/cryostat/cryostat:2.4.0"
1414
- name: RELATED_IMAGE_DATASOURCE
15-
value: "quay.io/cryostat/jfr-datasource:2.4.0-snapshot"
15+
value: "quay.io/cryostat/jfr-datasource:2.4.0"
1616
- name: RELATED_IMAGE_GRAFANA
17-
value: "quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4"
17+
value: "quay.io/cryostat/cryostat-grafana-dashboard:2.4.0"
1818
- name: RELATED_IMAGE_REPORTS
19-
value: "quay.io/cryostat/cryostat-reports:2.4.0-snapshot"
19+
value: "quay.io/cryostat/cryostat-reports:2.4.0"

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: quay.io/cryostat/cryostat-operator
16-
newTag: 2.4.0-dev
16+
newTag: 2.4.0

config/manifests/bases/cryostat-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
capabilities: Seamless Upgrades
66
categories: Monitoring, Developer Tools
7-
containerImage: quay.io/cryostat/cryostat-operator:2.4.0-dev
7+
containerImage: quay.io/cryostat/cryostat-operator:2.4.0
88
description: JVM monitoring and profiling tool
99
operatorframework.io/initialization-resource: |-
1010
{

internal/controllers/const_generated.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/controllers/insights/test/resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type InsightsTestResources struct {
3131
Resources *corev1.ResourceRequirements
3232
}
3333

34-
const expectedOperatorVersion = "2.4.0-dev"
34+
const expectedOperatorVersion = "2.4.0"
3535

3636
func (r *InsightsTestResources) NewGlobalPullSecret() *corev1.Secret {
3737
config := `{"auths":{"example.com":{"auth":"hello"},"cloud.openshift.com":{"auth":"world"}}}`

0 commit comments

Comments
 (0)