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): prepare for 3.0.1 #907

Merged
merged 3 commits into from
Jul 4, 2024
Merged
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
Next Next commit
chore(release): prepare for 3.0.1
andrewazores committed Jul 4, 2024

Unverified

This user has not yet uploaded their public signing key.
commit a36f6c7592c924f34f420493ca51d2b3ce453248
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ OS = $(shell go env GOOS)
ARCH = $(shell go env GOARCH)

# Current Operator version
export OPERATOR_VERSION ?= 3.0.0
export OPERATOR_VERSION ?= 3.0.1-dev
IMAGE_VERSION ?= $(OPERATOR_VERSION)
BUNDLE_VERSION ?= $(IMAGE_VERSION)
DEFAULT_NAMESPACE ?= quay.io/cryostat
@@ -62,7 +62,7 @@ export APP_NAME ?= Cryostat
# Images used by the operator
CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
CORE_NAME ?= cryostat
CORE_VERSION ?= 3.0.0
CORE_VERSION ?= 3.0.1-snapshot
export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
OAUTH2_PROXY_NAMESPACE ?= quay.io/oauth2-proxy
OAUTH2_PROXY_NAME ?= oauth2-proxy
@@ -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 ?= 3.0.0
OPENSHIFT_OAUTH_PROXY_VERSION ?= cryostat-v3.0
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.0
DATASOURCE_VERSION ?= 3.0.1-snapshot
export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
GRAFANA_NAME ?= cryostat-grafana-dashboard
GRAFANA_VERSION ?= 3.0.0
GRAFANA_VERSION ?= cryostat-v3.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this style of tag for Grafana anymore. I think we used 3.0-dev for Helm

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops, good catch

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs a make generate bundle as well

export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
REPORTS_NAME ?= cryostat-reports
REPORTS_VERSION ?= 3.0.0
REPORTS_VERSION ?= 3.0.1-snapshot
export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)
DATABASE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
DATABASE_NAME ?= cryostat-db
DATABASE_VERSION ?= 3.0.0
DATABASE_VERSION ?= cryostat-v3.0
export DATABASE_IMG ?= $(DATABASE_NAMESPACE)/$(DATABASE_NAME):$(DATABASE_VERSION)
STORAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
STORAGE_NAME ?= cryostat-storage
STORAGE_VERSION ?= 3.0.0
STORAGE_VERSION ?= cryostat-v3.0
export STORAGE_IMG ?= $(STORAGE_NAMESPACE)/$(STORAGE_NAME):$(STORAGE_VERSION)

CERT_MANAGER_VERSION ?= 1.11.5
@@ -109,7 +109,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 ?= 3.0.0-$(shell date -u '+%Y%m%d%H%M%S')
CUSTOM_SCORECARD_VERSION ?= 3.0.1-$(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
3 changes: 1 addition & 2 deletions bundle.Dockerfile
Original file line number Diff line number Diff line change
@@ -5,8 +5,7 @@ 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=stable
LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
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
40 changes: 20 additions & 20 deletions bundle/manifests/cryostat-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ metadata:
]
capabilities: Seamless Upgrades
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:3.0.0
createdAt: "2024-07-04T13:19:31Z"
containerImage: quay.io/cryostat/cryostat-operator:3.0.1-dev
createdAt: "2024-07-04T16:23:44Z"
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
@@ -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.0
name: cryostat-operator.v3.0.1-dev
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -994,19 +994,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:3.0.0
value: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0
- name: RELATED_IMAGE_CORE
value: quay.io/cryostat/cryostat:3.0.0
value: quay.io/cryostat/cryostat:3.0.1-snapshot
- name: RELATED_IMAGE_DATASOURCE
value: quay.io/cryostat/jfr-datasource:3.0.0
value: quay.io/cryostat/jfr-datasource:3.0.1-snapshot
- name: RELATED_IMAGE_GRAFANA
value: quay.io/cryostat/cryostat-grafana-dashboard:3.0.0
value: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v3.0
- name: RELATED_IMAGE_REPORTS
value: quay.io/cryostat/cryostat-reports:3.0.0
value: quay.io/cryostat/cryostat-reports:3.0.1-snapshot
- name: RELATED_IMAGE_STORAGE
value: quay.io/cryostat/cryostat-storage:3.0.0
value: quay.io/cryostat/cryostat-storage:cryostat-v3.0
- name: RELATED_IMAGE_DATABASE
value: quay.io/cryostat/cryostat-db:3.0.0
value: quay.io/cryostat/cryostat-db:cryostat-v3.0
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
@@ -1015,8 +1015,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/cryostat/cryostat-operator:3.0.0
imagePullPolicy: IfNotPresent
image: quay.io/cryostat/cryostat-operator:3.0.1-dev
imagePullPolicy: Always
livenessProbe:
httpGet:
path: /healthz
@@ -1171,21 +1171,21 @@ spec:
relatedImages:
- image: quay.io/oauth2-proxy/oauth2-proxy:latest
name: oauth2-proxy
- image: quay.io/cryostat/openshift-oauth-proxy:3.0.0
- image: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0
name: openshift-oauth-proxy
- image: quay.io/cryostat/cryostat:3.0.0
- image: quay.io/cryostat/cryostat:3.0.1-snapshot
name: core
- image: quay.io/cryostat/jfr-datasource:3.0.0
- image: quay.io/cryostat/jfr-datasource:3.0.1-snapshot
name: datasource
- image: quay.io/cryostat/cryostat-grafana-dashboard:3.0.0
- image: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v3.0
name: grafana
- image: quay.io/cryostat/cryostat-reports:3.0.0
- image: quay.io/cryostat/cryostat-reports:3.0.1-snapshot
name: reports
- image: quay.io/cryostat/cryostat-storage:3.0.0
- image: quay.io/cryostat/cryostat-storage:cryostat-v3.0
name: storage
- image: quay.io/cryostat/cryostat-db:3.0.0
- image: quay.io/cryostat/cryostat-db:cryostat-v3.0
name: database
version: 3.0.0
version: 3.0.1-dev
webhookdefinitions:
- admissionReviewVersions:
- v1
3 changes: 1 addition & 2 deletions bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
@@ -4,8 +4,7 @@ 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: stable
operators.operatorframework.io.bundle.channel.default.v1: stable
operators.operatorframework.io.bundle.channels.v1: alpha
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
12 changes: 6 additions & 6 deletions bundle/tests/scorecard/config.yaml
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- operator-install
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318
labels:
suite: cryostat
test: operator-install
@@ -80,7 +80,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-cr
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318
labels:
suite: cryostat
test: cryostat-cr
@@ -90,7 +90,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-multi-namespace
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318
labels:
suite: cryostat
test: cryostat-multi-namespace
@@ -100,7 +100,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-recording
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318
labels:
suite: cryostat
test: cryostat-recording
@@ -110,7 +110,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-config-change
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318
labels:
suite: cryostat
test: cryostat-config-change
@@ -120,7 +120,7 @@ stages:
- entrypoint:
- cryostat-scorecard-tests
- cryostat-report
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726
image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318
labels:
suite: cryostat
test: cryostat-report
2 changes: 1 addition & 1 deletion config/default/image_pull_patch.yaml
Original file line number Diff line number Diff line change
@@ -8,4 +8,4 @@ spec:
spec:
containers:
- name: manager
imagePullPolicy: "IfNotPresent"
imagePullPolicy: "Always"
14 changes: 7 additions & 7 deletions config/default/image_tag_patch.yaml
Original file line number Diff line number Diff line change
@@ -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:3.0.0"
value: "quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0"
- name: RELATED_IMAGE_CORE
value: "quay.io/cryostat/cryostat:3.0.0"
value: "quay.io/cryostat/cryostat:3.0.1-snapshot"
- name: RELATED_IMAGE_DATASOURCE
value: "quay.io/cryostat/jfr-datasource:3.0.0"
value: "quay.io/cryostat/jfr-datasource:3.0.1-snapshot"
- name: RELATED_IMAGE_GRAFANA
value: "quay.io/cryostat/cryostat-grafana-dashboard:3.0.0"
value: "quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v3.0"
- name: RELATED_IMAGE_REPORTS
value: "quay.io/cryostat/cryostat-reports:3.0.0"
value: "quay.io/cryostat/cryostat-reports:3.0.1-snapshot"
- name: RELATED_IMAGE_STORAGE
value: "quay.io/cryostat/cryostat-storage:3.0.0"
value: "quay.io/cryostat/cryostat-storage:cryostat-v3.0"
- name: RELATED_IMAGE_DATABASE
value: "quay.io/cryostat/cryostat-db:3.0.0"
value: "quay.io/cryostat/cryostat-db:cryostat-v3.0"
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -22,4 +22,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/cryostat/cryostat-operator
newTag: 3.0.0
newTag: 3.0.1-dev
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ metadata:
annotations:
capabilities: Seamless Upgrades
categories: Monitoring, Developer Tools
containerImage: quay.io/cryostat/cryostat-operator:3.0.0
containerImage: quay.io/cryostat/cryostat-operator:3.0.1-dev
description: JVM monitoring and profiling tool
operatorframework.io/initialization-resource: |-
{
12 changes: 6 additions & 6 deletions config/scorecard/patches/custom.config.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
entrypoint:
- cryostat-scorecard-tests
- operator-install
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726"
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318"
labels:
suite: cryostat
test: operator-install
@@ -18,7 +18,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-cr
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726"
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318"
labels:
suite: cryostat
test: cryostat-cr
@@ -28,7 +28,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-multi-namespace
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726"
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318"
labels:
suite: cryostat
test: cryostat-multi-namespace
@@ -38,7 +38,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-recording
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726"
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318"
labels:
suite: cryostat
test: cryostat-recording
@@ -48,7 +48,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-config-change
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726"
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318"
labels:
suite: cryostat
test: cryostat-config-change
@@ -58,7 +58,7 @@
entrypoint:
- cryostat-scorecard-tests
- cryostat-report
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240511064726"
image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240704162318"
labels:
suite: cryostat
test: cryostat-report
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.