chore(release): prepare 2.4.0 release (#693)

* chore(release): prepare 2.4.0 release

* fixup! chore(release): prepare 2.4.0 release

Author: andrewazores

Makefile

@@ -8,7 +8,7 @@ OS = $(shell go env GOOS)
 ARCH = $(shell go env GOARCH)
 
 # Current Operator version
-export OPERATOR_VERSION ?= 2.4.0-dev
+export OPERATOR_VERSION ?= 2.4.0
 IMAGE_VERSION ?= $(OPERATOR_VERSION)
 BUNDLE_VERSION ?= $(IMAGE_VERSION)
 DEFAULT_NAMESPACE ?= quay.io/cryostat
@@ -63,19 +63,19 @@ export APP_NAME ?= Cryostat
 # Images used by the operator
 CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 CORE_NAME ?= cryostat
-CORE_VERSION ?= 2.4.0-snapshot
+CORE_VERSION ?= 2.4.0
 export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
 DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 DATASOURCE_NAME ?= jfr-datasource
-DATASOURCE_VERSION ?= 2.4.0-snapshot
+DATASOURCE_VERSION ?= 2.4.0
 export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
 GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 GRAFANA_NAME ?= cryostat-grafana-dashboard
-GRAFANA_VERSION ?= cryostat-v2.4
+GRAFANA_VERSION ?= 2.4.0
 export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
 REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 REPORTS_NAME ?= cryostat-reports
-REPORTS_VERSION ?= 2.4.0-snapshot
+REPORTS_VERSION ?= 2.4.0
 export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)
 
 CERT_MANAGER_VERSION ?= 1.11.5

bundle.Dockerfile

@@ -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

bundle/manifests/cryostat-operator.clusterserviceversion.yaml

@@ -53,8 +53,8 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
-    containerImage: quay.io/cryostat/cryostat-operator:2.4.0-dev
-    createdAt: "2023-11-14T18:45:10Z"
+    containerImage: quay.io/cryostat/cryostat-operator:2.4.0
+    createdAt: "2023-12-08T18:53:01Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
@@ -79,7 +79,7 @@ metadata:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
     operatorframework.io/os.linux: supported
-  name: cryostat-operator.v2.4.0-dev
+  name: cryostat-operator.v2.4.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1097,13 +1097,13 @@ spec:
                 - /manager
                 env:
                 - name: RELATED_IMAGE_CORE
-                  value: quay.io/cryostat/cryostat:2.4.0-snapshot
+                  value: quay.io/cryostat/cryostat:2.4.0
                 - name: RELATED_IMAGE_DATASOURCE
-                  value: quay.io/cryostat/jfr-datasource:2.4.0-snapshot
+                  value: quay.io/cryostat/jfr-datasource:2.4.0
                 - name: RELATED_IMAGE_GRAFANA
-                  value: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4
+                  value: quay.io/cryostat/cryostat-grafana-dashboard:2.4.0
                 - name: RELATED_IMAGE_REPORTS
-                  value: quay.io/cryostat/cryostat-reports:2.4.0-snapshot
+                  value: quay.io/cryostat/cryostat-reports:2.4.0
                 - name: WATCH_NAMESPACE
                   valueFrom:
                     fieldRef:
@@ -1112,8 +1112,8 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/cryostat/cryostat-operator:2.4.0-dev
-                imagePullPolicy: Always
+                image: quay.io/cryostat/cryostat-operator:2.4.0
+                imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1219,12 +1219,12 @@ spec:
   provider:
     name: The Cryostat Community
   relatedImages:
-  - image: quay.io/cryostat/cryostat:2.4.0-snapshot
+  - image: quay.io/cryostat/cryostat:2.4.0
     name: core
-  - image: quay.io/cryostat/jfr-datasource:2.4.0-snapshot
+  - image: quay.io/cryostat/jfr-datasource:2.4.0
     name: datasource
-  - image: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4
+  - image: quay.io/cryostat/cryostat-grafana-dashboard:2.4.0
     name: grafana
-  - image: quay.io/cryostat/cryostat-reports:2.4.0-snapshot
+  - image: quay.io/cryostat/cryostat-reports:2.4.0
     name: reports
-  version: 2.4.0-dev
+  version: 2.4.0

bundle/metadata/annotations.yaml

@@ -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

config/default/image_pull_patch.yaml

@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: "Always"
+        imagePullPolicy: "IfNotPresent"

config/default/image_tag_patch.yaml

@@ -10,10 +10,10 @@ spec:
       - name: manager
         env:
         - name: RELATED_IMAGE_CORE
-          value: "quay.io/cryostat/cryostat:2.4.0-snapshot"
+          value: "quay.io/cryostat/cryostat:2.4.0"
         - name: RELATED_IMAGE_DATASOURCE
-          value: "quay.io/cryostat/jfr-datasource:2.4.0-snapshot"
+          value: "quay.io/cryostat/jfr-datasource:2.4.0"
         - name: RELATED_IMAGE_GRAFANA
-          value: "quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4"
+          value: "quay.io/cryostat/cryostat-grafana-dashboard:2.4.0"
         - name: RELATED_IMAGE_REPORTS
-          value: "quay.io/cryostat/cryostat-reports:2.4.0-snapshot"
+          value: "quay.io/cryostat/cryostat-reports:2.4.0"

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/cryostat/cryostat-operator
-  newTag: 2.4.0-dev
+  newTag: 2.4.0

config/manifests/bases/cryostat-operator.clusterserviceversion.yaml

@@ -4,7 +4,7 @@ metadata:
   annotations:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
-    containerImage: quay.io/cryostat/cryostat-operator:2.4.0-dev
+    containerImage: quay.io/cryostat/cryostat-operator:2.4.0
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {

internal/controllers/const_generated.go

@@ -31,7 +31,7 @@ type InsightsTestResources struct {
 	Resources *corev1.ResourceRequirements
 }
 
-const expectedOperatorVersion = "2.4.0-dev"
+const expectedOperatorVersion = "2.4.0"
 
 func (r *InsightsTestResources) NewGlobalPullSecret() *corev1.Secret {
 	config := `{"auths":{"example.com":{"auth":"hello"},"cloud.openshift.com":{"auth":"world"}}}`