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

build(versions): bump versions for 4.1.0 development #1043

Merged
merged 3 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion .mergify.yml
andrewazores marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pull_request_rules:
actions:
backport:
branches:
- cryostat-v3.0
- cryostat-v4.0
assignees:
- "{{ author }}"
- name: auto label PRs from reviewers
Expand Down
8 changes: 4 additions & 4 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 ?= 4.0.0-dev
export OPERATOR_VERSION ?= 4.1.0-dev
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 ?= 4.0.0-snapshot
CORE_VERSION ?= latest
export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
OAUTH2_PROXY_NAMESPACE ?= quay.io/oauth2-proxy
OAUTH2_PROXY_NAME ?= oauth2-proxy
Expand All @@ -71,7 +71,7 @@ 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 ?= go-1.22
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
Expand Down Expand Up @@ -121,7 +121,7 @@ ENVTEST_K8S_VERSION ?= 1.26
# See: https://github.com/operator-framework/operator-sdk/pull/4762
#
# Suffix is the timestamp of the image build, compute with: date -u '+%Y%m%d%H%M%S'
CUSTOM_SCORECARD_VERSION ?= 4.0.0-$(shell date -u '+%Y%m%d%H%M%S')
CUSTOM_SCORECARD_VERSION ?= 4.1.0-$(shell date -u '+%Y%m%d%H%M%S')
export CUSTOM_SCORECARD_IMG ?= $(IMAGE_TAG_BASE)-scorecard:$(CUSTOM_SCORECARD_VERSION)

DEPLOY_NAMESPACE ?= cryostat-operator-system
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 @@ -23,8 +23,8 @@ metadata:
]
capabilities: Seamless Upgrades
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev
createdAt: "2025-02-04T23:08:18Z"
containerImage: quay.io/cryostat/cryostat-operator:4.1.0-dev
createdAt: "2025-02-05T19:21:11Z"
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand All @@ -48,7 +48,7 @@ metadata:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.arm64: supported
operatorframework.io/os.linux: supported
name: cryostat-operator.v4.0.0-dev
name: cryostat-operator.v4.1.0-dev
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1131,9 +1131,9 @@ 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:go-1.22
- name: RELATED_IMAGE_CORE
value: quay.io/cryostat/cryostat:4.0.0-snapshot
value: quay.io/cryostat/cryostat:latest
- name: RELATED_IMAGE_DATASOURCE
value: quay.io/cryostat/jfr-datasource:latest
- name: RELATED_IMAGE_GRAFANA
Expand All @@ -1152,7 +1152,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
image: quay.io/cryostat/cryostat-operator:4.0.0-dev
image: quay.io/cryostat/cryostat-operator:4.1.0-dev
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -1299,9 +1299,9 @@ 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:go-1.22
name: openshift-oauth-proxy
- image: quay.io/cryostat/cryostat:4.0.0-snapshot
- image: quay.io/cryostat/cryostat:latest
name: core
- image: quay.io/cryostat/jfr-datasource:latest
name: datasource
Expand All @@ -1317,7 +1317,7 @@ spec:
name: agent-proxy
- image: quay.io/cryostat/cryostat-agent-init:latest
name: agent-init
version: 4.0.0-dev
version: 4.1.0-dev
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
12 changes: 6 additions & 6 deletions bundle/tests/scorecard/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- operator-install
image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845
labels:
suite: cryostat
test: operator-install
Expand All @@ -80,7 +80,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-cr
image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845
labels:
suite: cryostat
test: cryostat-cr
Expand All @@ -90,7 +90,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-multi-namespace
image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845
labels:
suite: cryostat
test: cryostat-multi-namespace
Expand All @@ -100,7 +100,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-recording
image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845
labels:
suite: cryostat
test: cryostat-recording
Expand All @@ -110,7 +110,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-config-change
image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845
labels:
suite: cryostat
test: cryostat-config-change
Expand All @@ -120,7 +120,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-report
image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845
labels:
suite: cryostat
test: cryostat-report
Expand Down
4 changes: 2 additions & 2 deletions config/default/image_tag_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ 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:go-1.22"
- name: RELATED_IMAGE_CORE
value: "quay.io/cryostat/cryostat:4.0.0-snapshot"
value: "quay.io/cryostat/cryostat:latest"
- name: RELATED_IMAGE_DATASOURCE
value: "quay.io/cryostat/jfr-datasource:latest"
- name: RELATED_IMAGE_GRAFANA
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: 4.0.0-dev
newTag: 4.1.0-dev
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:4.0.0-dev
containerImage: quay.io/cryostat/cryostat-operator:4.1.0-dev
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
Expand Down
12 changes: 6 additions & 6 deletions config/scorecard/patches/custom.config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
entrypoint:
- cryostat-scorecard-tests
- operator-install
image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845"
labels:
suite: cryostat
test: operator-install
Expand All @@ -18,7 +18,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-cr
image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845"
labels:
suite: cryostat
test: cryostat-cr
Expand All @@ -28,7 +28,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-multi-namespace
image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845"
labels:
suite: cryostat
test: cryostat-multi-namespace
Expand All @@ -38,7 +38,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-recording
image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845"
labels:
suite: cryostat
test: cryostat-recording
Expand All @@ -48,7 +48,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-config-change
image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845"
labels:
suite: cryostat
test: cryostat-config-change
Expand All @@ -58,7 +58,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-report
image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845"
labels:
suite: cryostat
test: cryostat-report
6 changes: 3 additions & 3 deletions internal/controllers/constants/const_generated.go

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