Skip to content

Commit

Permalink
build(version): set versions for 2.1.0 release (#395)
Browse files Browse the repository at this point in the history
  • Loading branch information
ebaron authored May 12, 2022
1 parent a4263d9 commit b4e547e
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 30 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SHELL := /bin/bash

# Current Operator version
IMAGE_VERSION ?= 2.1.0-dev
IMAGE_VERSION ?= 2.1.0
BUNDLE_VERSION ?= $(IMAGE_VERSION)
DEFAULT_NAMESPACE ?= quay.io/cryostat
IMAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
Expand All @@ -28,19 +28,19 @@ CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
# Images used by the operator
CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
CORE_NAME ?= cryostat
CORE_VERSION ?= 2.1.0-SNAPSHOT
CORE_VERSION ?= 2.1.0
export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
DATASOURCE_NAME ?= jfr-datasource
DATASOURCE_VERSION ?= 2.0.0
DATASOURCE_VERSION ?= 2.1.0
export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
GRAFANA_NAME ?= cryostat-grafana-dashboard
GRAFANA_VERSION ?= 2.0.0
GRAFANA_VERSION ?= 2.1.0
export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
REPORTS_NAME ?= cryostat-reports
REPORTS_VERSION ?= 1.0.0-SNAPSHOT
REPORTS_VERSION ?= 1.0.0
export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)

CERT_MANAGER_VERSION ?= 1.5.3
Expand Down
3 changes: 2 additions & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=cryostat-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.bundle.channels.v1=stable
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.4.0+git
Expand Down
20 changes: 10 additions & 10 deletions bundle/manifests/cryostat-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ metadata:
]
capabilities: Basic Install
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:2.1.0-dev
createdAt: "2021-04-30 00:00:00"
containerImage: quay.io/cryostat/cryostat-operator:2.1.0
createdAt: "2022-05-12 00:00:00"
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand All @@ -85,7 +85,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: github.com/cryostatio/cryostat-operator
support: Cryostat Community
name: cryostat-operator.v2.1.0-dev
name: cryostat-operator.v2.1.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -480,19 +480,19 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_CORE
value: quay.io/cryostat/cryostat:2.1.0-SNAPSHOT
value: quay.io/cryostat/cryostat:2.1.0
- name: RELATED_IMAGE_DATASOURCE
value: quay.io/cryostat/jfr-datasource:2.0.0
value: quay.io/cryostat/jfr-datasource:2.1.0
- name: RELATED_IMAGE_GRAFANA
value: quay.io/cryostat/cryostat-grafana-dashboard:2.0.0
value: quay.io/cryostat/cryostat-grafana-dashboard:2.1.0
- name: RELATED_IMAGE_REPORTS
value: quay.io/cryostat/cryostat-reports:1.0.0-SNAPSHOT
value: quay.io/cryostat/cryostat-reports:1.0.0
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
image: quay.io/cryostat/cryostat-operator:2.1.0-dev
imagePullPolicy: Always
image: quay.io/cryostat/cryostat-operator:2.1.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -740,4 +740,4 @@ spec:
maturity: stable
provider:
name: The Cryostat Community
version: 2.1.0-dev
version: 2.1.0
3 changes: 2 additions & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ annotations:
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: cryostat-operator
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.bundle.channels.v1: stable
operators.operatorframework.io.bundle.channel.default.v1: stable
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.builder: operator-sdk-v1.4.0+git
Expand Down
2 changes: 1 addition & 1 deletion config/default/image_pull_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ spec:
spec:
containers:
- name: manager
imagePullPolicy: "Always"
imagePullPolicy: "IfNotPresent"
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:2.1.0-SNAPSHOT"
value: "quay.io/cryostat/cryostat:2.1.0"
- name: RELATED_IMAGE_DATASOURCE
value: "quay.io/cryostat/jfr-datasource:2.0.0"
value: "quay.io/cryostat/jfr-datasource:2.1.0"
- name: RELATED_IMAGE_GRAFANA
value: "quay.io/cryostat/cryostat-grafana-dashboard:2.0.0"
value: "quay.io/cryostat/cryostat-grafana-dashboard:2.1.0"
- name: RELATED_IMAGE_REPORTS
value: "quay.io/cryostat/cryostat-reports:1.0.0-SNAPSHOT"
value: "quay.io/cryostat/cryostat-reports:1.0.0"
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/cryostat/cryostat-operator
newTag: 2.1.0-dev
newTag: 2.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ metadata:
]
capabilities: Basic Install
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:2.1.0-dev
createdAt: "2021-04-30 00:00:00"
containerImage: quay.io/cryostat/cryostat-operator:2.1.0
createdAt: "2022-05-12 00:00:00"
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand Down Expand Up @@ -418,4 +418,4 @@ spec:
maturity: stable
provider:
name: The Cryostat Community
version: 2.1.0-dev
version: 2.1.0

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

0 comments on commit b4e547e

Please sign in to comment.