Skip to content

Commit e52c010

Browse files
andrewazoresandrewazores
authored
chore(release): adjust version tags and channels for 3.0 release (#904)
1 parent 3af7eb2 commit e52c010

File tree

9 files changed

+50
-48
lines changed

9 files changed

+50
-48
lines changed

‎Makefile‎

Lines changed: 8 additions & 8 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 ?= 3.0.0-dev
11+
export OPERATOR_VERSION ?= 3.0.0
1212
IMAGE_VERSION ?= $(OPERATOR_VERSION)
1313
BUNDLE_VERSION ?= $(IMAGE_VERSION)
1414
DEFAULT_NAMESPACE ?= quay.io/cryostat
@@ -62,7 +62,7 @@ export APP_NAME ?= Cryostat
6262
# Images used by the operator
6363
CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
6464
CORE_NAME ?= cryostat
65-
CORE_VERSION ?= 3.0.0-snapshot
65+
CORE_VERSION ?= 3.0.0
6666
export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
6767
OAUTH2_PROXY_NAMESPACE ?= quay.io/oauth2-proxy
6868
OAUTH2_PROXY_NAME ?= oauth2-proxy
@@ -71,27 +71,27 @@ export OAUTH2_PROXY_IMG ?= $(OAUTH2_PROXY_NAMESPACE)/$(OAUTH2_PROXY_NAME):$(OAUT
7171
OPENSHIFT_OAUTH_PROXY_NAMESPACE ?= quay.io/cryostat
7272
OPENSHIFT_OAUTH_PROXY_NAME ?= openshift-oauth-proxy
7373
# there is no 'latest' tag for this container
74-
OPENSHIFT_OAUTH_PROXY_VERSION ?= cryostat-v3.0
74+
OPENSHIFT_OAUTH_PROXY_VERSION ?= 3.0.0
7575
export OPENSHIFT_OAUTH_PROXY_IMG ?= $(OPENSHIFT_OAUTH_PROXY_NAMESPACE)/$(OPENSHIFT_OAUTH_PROXY_NAME):$(OPENSHIFT_OAUTH_PROXY_VERSION)
7676
DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
7777
DATASOURCE_NAME ?= jfr-datasource
78-
DATASOURCE_VERSION ?= latest
78+
DATASOURCE_VERSION ?= 3.0.0
7979
export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
8080
GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
8181
GRAFANA_NAME ?= cryostat-grafana-dashboard
82-
GRAFANA_VERSION ?= latest
82+
GRAFANA_VERSION ?= 3.0.0
8383
export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
8484
REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
8585
REPORTS_NAME ?= cryostat-reports
86-
REPORTS_VERSION ?= latest
86+
REPORTS_VERSION ?= 3.0.0
8787
export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)
8888
DATABASE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
8989
DATABASE_NAME ?= cryostat-db
90-
DATABASE_VERSION ?= latest
90+
DATABASE_VERSION ?= 3.0.0
9191
export DATABASE_IMG ?= $(DATABASE_NAMESPACE)/$(DATABASE_NAME):$(DATABASE_VERSION)
9292
STORAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
9393
STORAGE_NAME ?= cryostat-storage
94-
STORAGE_VERSION ?= latest
94+
STORAGE_VERSION ?= 3.0.0
9595
export STORAGE_IMG ?= $(STORAGE_NAMESPACE)/$(STORAGE_NAME):$(STORAGE_VERSION)
9696

9797
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: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ metadata:
2929
]
3030
capabilities: Seamless Upgrades
3131
categories: Monitoring, Developer Tools
32-
containerImage: quay.io/cryostat/cryostat-operator:3.0.0-dev
33-
createdAt: "2024-06-17T15:39:51Z"
32+
containerImage: quay.io/cryostat/cryostat-operator:3.0.0
33+
createdAt: "2024-07-04T13:19:31Z"
3434
description: JVM monitoring and profiling tool
3535
operatorframework.io/initialization-resource: |-
3636
{
@@ -54,7 +54,7 @@ metadata:
5454
operatorframework.io/arch.amd64: supported
5555
operatorframework.io/arch.arm64: supported
5656
operatorframework.io/os.linux: supported
57-
name: cryostat-operator.v3.0.0-dev
57+
name: cryostat-operator.v3.0.0
5858
namespace: placeholder
5959
spec:
6060
apiservicedefinitions: {}
@@ -994,19 +994,19 @@ spec:
994994
- name: RELATED_IMAGE_OAUTH2_PROXY
995995
value: quay.io/oauth2-proxy/oauth2-proxy:latest
996996
- name: RELATED_IMAGE_OPENSHIFT_OAUTH_PROXY
997-
value: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0
997+
value: quay.io/cryostat/openshift-oauth-proxy:3.0.0
998998
- name: RELATED_IMAGE_CORE
999-
value: quay.io/cryostat/cryostat:3.0.0-snapshot
999+
value: quay.io/cryostat/cryostat:3.0.0
10001000
- name: RELATED_IMAGE_DATASOURCE
1001-
value: quay.io/cryostat/jfr-datasource:latest
1001+
value: quay.io/cryostat/jfr-datasource:3.0.0
10021002
- name: RELATED_IMAGE_GRAFANA
1003-
value: quay.io/cryostat/cryostat-grafana-dashboard:latest
1003+
value: quay.io/cryostat/cryostat-grafana-dashboard:3.0.0
10041004
- name: RELATED_IMAGE_REPORTS
1005-
value: quay.io/cryostat/cryostat-reports:latest
1005+
value: quay.io/cryostat/cryostat-reports:3.0.0
10061006
- name: RELATED_IMAGE_STORAGE
1007-
value: quay.io/cryostat/cryostat-storage:latest
1007+
value: quay.io/cryostat/cryostat-storage:3.0.0
10081008
- name: RELATED_IMAGE_DATABASE
1009-
value: quay.io/cryostat/cryostat-db:latest
1009+
value: quay.io/cryostat/cryostat-db:3.0.0
10101010
- name: WATCH_NAMESPACE
10111011
valueFrom:
10121012
fieldRef:
@@ -1015,8 +1015,8 @@ spec:
10151015
valueFrom:
10161016
fieldRef:
10171017
fieldPath: metadata.namespace
1018-
image: quay.io/cryostat/cryostat-operator:3.0.0-dev
1019-
imagePullPolicy: Always
1018+
image: quay.io/cryostat/cryostat-operator:3.0.0
1019+
imagePullPolicy: IfNotPresent
10201020
livenessProbe:
10211021
httpGet:
10221022
path: /healthz
@@ -1171,21 +1171,21 @@ spec:
11711171
relatedImages:
11721172
- image: quay.io/oauth2-proxy/oauth2-proxy:latest
11731173
name: oauth2-proxy
1174-
- image: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0
1174+
- image: quay.io/cryostat/openshift-oauth-proxy:3.0.0
11751175
name: openshift-oauth-proxy
1176-
- image: quay.io/cryostat/cryostat:3.0.0-snapshot
1176+
- image: quay.io/cryostat/cryostat:3.0.0
11771177
name: core
1178-
- image: quay.io/cryostat/jfr-datasource:latest
1178+
- image: quay.io/cryostat/jfr-datasource:3.0.0
11791179
name: datasource
1180-
- image: quay.io/cryostat/cryostat-grafana-dashboard:latest
1180+
- image: quay.io/cryostat/cryostat-grafana-dashboard:3.0.0
11811181
name: grafana
1182-
- image: quay.io/cryostat/cryostat-reports:latest
1182+
- image: quay.io/cryostat/cryostat-reports:3.0.0
11831183
name: reports
1184-
- image: quay.io/cryostat/cryostat-storage:latest
1184+
- image: quay.io/cryostat/cryostat-storage:3.0.0
11851185
name: storage
1186-
- image: quay.io/cryostat/cryostat-db:latest
1186+
- image: quay.io/cryostat/cryostat-db:3.0.0
11871187
name: database
1188-
version: 3.0.0-dev
1188+
version: 3.0.0
11891189
webhookdefinitions:
11901190
- admissionReviewVersions:
11911191
- v1

‎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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ spec:
1212
- name: RELATED_IMAGE_OAUTH2_PROXY
1313
value: "quay.io/oauth2-proxy/oauth2-proxy:latest"
1414
- name: RELATED_IMAGE_OPENSHIFT_OAUTH_PROXY
15-
value: "quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0"
15+
value: "quay.io/cryostat/openshift-oauth-proxy:3.0.0"
1616
- name: RELATED_IMAGE_CORE
17-
value: "quay.io/cryostat/cryostat:3.0.0-snapshot"
17+
value: "quay.io/cryostat/cryostat:3.0.0"
1818
- name: RELATED_IMAGE_DATASOURCE
19-
value: "quay.io/cryostat/jfr-datasource:latest"
19+
value: "quay.io/cryostat/jfr-datasource:3.0.0"
2020
- name: RELATED_IMAGE_GRAFANA
21-
value: "quay.io/cryostat/cryostat-grafana-dashboard:latest"
21+
value: "quay.io/cryostat/cryostat-grafana-dashboard:3.0.0"
2222
- name: RELATED_IMAGE_REPORTS
23-
value: "quay.io/cryostat/cryostat-reports:latest"
23+
value: "quay.io/cryostat/cryostat-reports:3.0.0"
2424
- name: RELATED_IMAGE_STORAGE
25-
value: "quay.io/cryostat/cryostat-storage:latest"
25+
value: "quay.io/cryostat/cryostat-storage:3.0.0"
2626
- name: RELATED_IMAGE_DATABASE
27-
value: "quay.io/cryostat/cryostat-db:latest"
27+
value: "quay.io/cryostat/cryostat-db:3.0.0"

‎config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ kind: Kustomization
2222
images:
2323
- name: controller
2424
newName: quay.io/cryostat/cryostat-operator
25-
newTag: 3.0.0-dev
25+
newTag: 3.0.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:3.0.0-dev
7+
containerImage: quay.io/cryostat/cryostat-operator:3.0.0
88
description: JVM monitoring and profiling tool
99
operatorframework.io/initialization-resource: |-
1010
{

‎internal/controllers/const_generated.go‎

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

0 commit comments

Comments
 (0)