Skip to content

Commit

Permalink
chore(versions): use release branch image tags (#663)
Browse files Browse the repository at this point in the history
  • Loading branch information
ebaron authored Oct 30, 2023
1 parent f0fd6a0 commit a8a5c79
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ export APP_NAME ?= Cryostat
# Images used by the operator
CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
CORE_NAME ?= cryostat
CORE_VERSION ?= latest
CORE_VERSION ?= 2.4.0-snapshot
export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
DATASOURCE_NAME ?= jfr-datasource
DATASOURCE_VERSION ?= latest
DATASOURCE_VERSION ?= 2.4.0-snapshot
export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
GRAFANA_NAME ?= cryostat-grafana-dashboard
GRAFANA_VERSION ?= latest
GRAFANA_VERSION ?= cryostat-v2.4
export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
REPORTS_NAME ?= cryostat-reports
REPORTS_VERSION ?= latest
REPORTS_VERSION ?= 2.4.0-snapshot
export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)

CERT_MANAGER_VERSION ?= 1.11.5
Expand Down
18 changes: 9 additions & 9 deletions bundle/manifests/cryostat-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ metadata:
capabilities: Seamless Upgrades
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:2.4.0-dev
createdAt: "2023-09-28T14:25:20Z"
createdAt: "2023-10-27T14:13:11Z"
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand Down Expand Up @@ -1073,13 +1073,13 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_CORE
value: quay.io/cryostat/cryostat:latest
value: quay.io/cryostat/cryostat:2.4.0-snapshot
- name: RELATED_IMAGE_DATASOURCE
value: quay.io/cryostat/jfr-datasource:latest
value: quay.io/cryostat/jfr-datasource:2.4.0-snapshot
- name: RELATED_IMAGE_GRAFANA
value: quay.io/cryostat/cryostat-grafana-dashboard:latest
value: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4
- name: RELATED_IMAGE_REPORTS
value: quay.io/cryostat/cryostat-reports:latest
value: quay.io/cryostat/cryostat-reports:2.4.0-snapshot
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
Expand Down Expand Up @@ -1191,12 +1191,12 @@ spec:
provider:
name: The Cryostat Community
relatedImages:
- image: quay.io/cryostat/cryostat:latest
- image: quay.io/cryostat/cryostat:2.4.0-snapshot
name: core
- image: quay.io/cryostat/jfr-datasource:latest
- image: quay.io/cryostat/jfr-datasource:2.4.0-snapshot
name: datasource
- image: quay.io/cryostat/cryostat-grafana-dashboard:latest
- image: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4
name: grafana
- image: quay.io/cryostat/cryostat-reports:latest
- image: quay.io/cryostat/cryostat-reports:2.4.0-snapshot
name: reports
version: 2.4.0-dev
8 changes: 4 additions & 4 deletions config/default/image_tag_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_CORE
value: "quay.io/cryostat/cryostat:latest"
value: "quay.io/cryostat/cryostat:2.4.0-snapshot"
- name: RELATED_IMAGE_DATASOURCE
value: "quay.io/cryostat/jfr-datasource:latest"
value: "quay.io/cryostat/jfr-datasource:2.4.0-snapshot"
- name: RELATED_IMAGE_GRAFANA
value: "quay.io/cryostat/cryostat-grafana-dashboard:latest"
value: "quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4"
- name: RELATED_IMAGE_REPORTS
value: "quay.io/cryostat/cryostat-reports:latest"
value: "quay.io/cryostat/cryostat-reports:2.4.0-snapshot"
8 changes: 4 additions & 4 deletions internal/controllers/const_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a8a5c79

Please sign in to comment.