Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): set versions for 3.0.1 #954

Merged
merged 3 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ OS = $(shell go env GOOS)
ARCH = $(shell go env GOARCH)

# Current Operator version
export OPERATOR_VERSION ?= 3.0.1-dev
export OPERATOR_VERSION ?= 3.0.1
IMAGE_VERSION ?= $(OPERATOR_VERSION)
BUNDLE_VERSION ?= $(IMAGE_VERSION)
DEFAULT_NAMESPACE ?= quay.io/cryostat
Expand Down Expand Up @@ -62,7 +62,7 @@ export APP_NAME ?= Cryostat
# Images used by the operator
CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
CORE_NAME ?= cryostat
CORE_VERSION ?= 3.0.1-snapshot
CORE_VERSION ?= 3.0.1
export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
OAUTH2_PROXY_NAMESPACE ?= quay.io/oauth2-proxy
OAUTH2_PROXY_NAME ?= oauth2-proxy
Expand All @@ -71,27 +71,27 @@ export OAUTH2_PROXY_IMG ?= $(OAUTH2_PROXY_NAMESPACE)/$(OAUTH2_PROXY_NAME):$(OAUT
OPENSHIFT_OAUTH_PROXY_NAMESPACE ?= quay.io/cryostat
OPENSHIFT_OAUTH_PROXY_NAME ?= openshift-oauth-proxy
# there is no 'latest' tag for this container
OPENSHIFT_OAUTH_PROXY_VERSION ?= cryostat-v3.0
OPENSHIFT_OAUTH_PROXY_VERSION ?= 3.0.1
export OPENSHIFT_OAUTH_PROXY_IMG ?= $(OPENSHIFT_OAUTH_PROXY_NAMESPACE)/$(OPENSHIFT_OAUTH_PROXY_NAME):$(OPENSHIFT_OAUTH_PROXY_VERSION)
DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
DATASOURCE_NAME ?= jfr-datasource
DATASOURCE_VERSION ?= 3.0.1-snapshot
DATASOURCE_VERSION ?= 3.0.1
export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
GRAFANA_NAME ?= cryostat-grafana-dashboard
GRAFANA_VERSION ?= 3.0-dev
GRAFANA_VERSION ?= 3.0.1
export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
REPORTS_NAME ?= cryostat-reports
REPORTS_VERSION ?= 3.0.1-snapshot
REPORTS_VERSION ?= 3.0.1
export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)
DATABASE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
DATABASE_NAME ?= cryostat-db
DATABASE_VERSION ?= cryostat-v3.0
DATABASE_VERSION ?= 3.0.1
export DATABASE_IMG ?= $(DATABASE_NAMESPACE)/$(DATABASE_NAME):$(DATABASE_VERSION)
STORAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
STORAGE_NAME ?= cryostat-storage
STORAGE_VERSION ?= cryostat-v3.0
STORAGE_VERSION ?= 3.0.1
export STORAGE_IMG ?= $(STORAGE_NAMESPACE)/$(STORAGE_NAME):$(STORAGE_VERSION)

CERT_MANAGER_VERSION ?= 1.11.5
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.builder=operator-sdk-v1.31.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
Expand Down
40 changes: 20 additions & 20 deletions bundle/manifests/cryostat-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ metadata:
]
capabilities: Seamless Upgrades
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:3.0.1-dev
createdAt: "2024-09-11T18:19:07Z"
containerImage: quay.io/cryostat/cryostat-operator:3.0.1
createdAt: "2024-09-20T18:33:44Z"
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand All @@ -54,7 +54,7 @@ metadata:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.arm64: supported
operatorframework.io/os.linux: supported
name: cryostat-operator.v3.0.1-dev
name: cryostat-operator.v3.0.1
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -997,19 +997,19 @@ spec:
- name: RELATED_IMAGE_OAUTH2_PROXY
value: quay.io/oauth2-proxy/oauth2-proxy:latest
- name: RELATED_IMAGE_OPENSHIFT_OAUTH_PROXY
value: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0
value: quay.io/cryostat/openshift-oauth-proxy:3.0.1
- name: RELATED_IMAGE_CORE
value: quay.io/cryostat/cryostat:3.0.1-snapshot
value: quay.io/cryostat/cryostat:3.0.1
- name: RELATED_IMAGE_DATASOURCE
value: quay.io/cryostat/jfr-datasource:3.0.1-snapshot
value: quay.io/cryostat/jfr-datasource:3.0.1
- name: RELATED_IMAGE_GRAFANA
value: quay.io/cryostat/cryostat-grafana-dashboard:3.0-dev
value: quay.io/cryostat/cryostat-grafana-dashboard:3.0.1
- name: RELATED_IMAGE_REPORTS
value: quay.io/cryostat/cryostat-reports:3.0.1-snapshot
value: quay.io/cryostat/cryostat-reports:3.0.1
- name: RELATED_IMAGE_STORAGE
value: quay.io/cryostat/cryostat-storage:cryostat-v3.0
value: quay.io/cryostat/cryostat-storage:3.0.1
- name: RELATED_IMAGE_DATABASE
value: quay.io/cryostat/cryostat-db:cryostat-v3.0
value: quay.io/cryostat/cryostat-db:3.0.1
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
Expand All @@ -1018,8 +1018,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/cryostat/cryostat-operator:3.0.1-dev
imagePullPolicy: Always
image: quay.io/cryostat/cryostat-operator:3.0.1
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -1165,21 +1165,21 @@ spec:
relatedImages:
- image: quay.io/oauth2-proxy/oauth2-proxy:latest
name: oauth2-proxy
- image: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0
- image: quay.io/cryostat/openshift-oauth-proxy:3.0.1
name: openshift-oauth-proxy
- image: quay.io/cryostat/cryostat:3.0.1-snapshot
- image: quay.io/cryostat/cryostat:3.0.1
name: core
- image: quay.io/cryostat/jfr-datasource:3.0.1-snapshot
- image: quay.io/cryostat/jfr-datasource:3.0.1
name: datasource
- image: quay.io/cryostat/cryostat-grafana-dashboard:3.0-dev
- image: quay.io/cryostat/cryostat-grafana-dashboard:3.0.1
name: grafana
- image: quay.io/cryostat/cryostat-reports:3.0.1-snapshot
- image: quay.io/cryostat/cryostat-reports:3.0.1
name: reports
- image: quay.io/cryostat/cryostat-storage:cryostat-v3.0
- image: quay.io/cryostat/cryostat-storage:3.0.1
name: storage
- image: quay.io/cryostat/cryostat-db:cryostat-v3.0
- image: quay.io/cryostat/cryostat-db:3.0.1
name: database
version: 3.0.1-dev
version: 3.0.1
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
4 changes: 2 additions & 2 deletions bundle/manifests/operator.cryostat.io_cryostats.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: cryostat-operator-system/cryostat-operator-serving-cert
cert-manager.io/inject-ca-from: cryostat/cryostat-operator-serving-cert
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
labels:
Expand All @@ -15,7 +15,7 @@ spec:
clientConfig:
service:
name: cryostat-operator-webhook-service
namespace: cryostat-operator-system
namespace: cryostat
path: /convert
conversionReviewVersions:
- v1
Expand Down
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.builder: operator-sdk-v1.31.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
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"
14 changes: 7 additions & 7 deletions config/default/image_tag_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ spec:
- name: RELATED_IMAGE_OAUTH2_PROXY
value: "quay.io/oauth2-proxy/oauth2-proxy:latest"
- name: RELATED_IMAGE_OPENSHIFT_OAUTH_PROXY
value: "quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0"
value: "quay.io/cryostat/openshift-oauth-proxy:3.0.1"
- name: RELATED_IMAGE_CORE
value: "quay.io/cryostat/cryostat:3.0.1-snapshot"
value: "quay.io/cryostat/cryostat:3.0.1"
- name: RELATED_IMAGE_DATASOURCE
value: "quay.io/cryostat/jfr-datasource:3.0.1-snapshot"
value: "quay.io/cryostat/jfr-datasource:3.0.1"
- name: RELATED_IMAGE_GRAFANA
value: "quay.io/cryostat/cryostat-grafana-dashboard:3.0-dev"
value: "quay.io/cryostat/cryostat-grafana-dashboard:3.0.1"
- name: RELATED_IMAGE_REPORTS
value: "quay.io/cryostat/cryostat-reports:3.0.1-snapshot"
value: "quay.io/cryostat/cryostat-reports:3.0.1"
- name: RELATED_IMAGE_STORAGE
value: "quay.io/cryostat/cryostat-storage:cryostat-v3.0"
value: "quay.io/cryostat/cryostat-storage:3.0.1"
- name: RELATED_IMAGE_DATABASE
value: "quay.io/cryostat/cryostat-db:cryostat-v3.0"
value: "quay.io/cryostat/cryostat-db:3.0.1"
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Adds namespace to all resources.
namespace: cryostat-operator-system
namespace: cryostat
andrewazores marked this conversation as resolved.
Show resolved Hide resolved

# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/cryostat/cryostat-operator
newTag: 3.0.1-dev
newTag: 3.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
capabilities: Seamless Upgrades
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:3.0.1-dev
containerImage: quay.io/cryostat/cryostat-operator:3.0.1
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand Down
16 changes: 8 additions & 8 deletions internal/controllers/const_generated.go

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

Loading