chore(release): prepare for 2.4.1 development (#694)

* chore(release): prepare for 2.4.1 development * fixup! chore(release): prepare for 2.4.1 development
cryostatio · Dec 18, 2023 · 41a91c3 · 41a91c3
1 parent 95e76b6
commit 41a91c3
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ OS = $(shell go env GOOS)
 ARCH = $(shell go env GOARCH)
 
 # Current Operator version
-export OPERATOR_VERSION ?= 2.4.0
+export OPERATOR_VERSION ?= 2.4.1-dev
 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
+CORE_VERSION ?= 2.4.1-snapshot
 export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION)
 DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 DATASOURCE_NAME ?= jfr-datasource
-DATASOURCE_VERSION ?= 2.4.0
+DATASOURCE_VERSION ?= 2.4.1-snapshot
 export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
 GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 GRAFANA_NAME ?= cryostat-grafana-dashboard
-GRAFANA_VERSION ?= 2.4.0
+GRAFANA_VERSION ?= cryostat-v2.4
 export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
 REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 REPORTS_NAME ?= cryostat-reports
-REPORTS_VERSION ?= 2.4.0
+REPORTS_VERSION ?= 2.4.1-snapshot
 export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)
 
 CERT_MANAGER_VERSION ?= 1.11.5
@@ -93,7 +93,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 ?= 2.4.0-$(shell date -u '+%Y%m%d%H%M%S')
+CUSTOM_SCORECARD_VERSION ?= 2.4.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

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -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

diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/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
-    createdAt: "2023-12-08T18:53:01Z"
+    containerImage: quay.io/cryostat/cryostat-operator:2.4.1-dev
+    createdAt: "2023-12-08T21:11:45Z"
     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
+  name: cryostat-operator.v2.4.1-dev
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1097,13 +1097,13 @@ spec:
                 - /manager
                 env:
                 - name: RELATED_IMAGE_CORE
-                  value: quay.io/cryostat/cryostat:2.4.0
+                  value: quay.io/cryostat/cryostat:2.4.1-snapshot
                 - name: RELATED_IMAGE_DATASOURCE
-                  value: quay.io/cryostat/jfr-datasource:2.4.0
+                  value: quay.io/cryostat/jfr-datasource:2.4.1-snapshot
                 - name: RELATED_IMAGE_GRAFANA
-                  value: quay.io/cryostat/cryostat-grafana-dashboard:2.4.0
+                  value: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4
                 - name: RELATED_IMAGE_REPORTS
-                  value: quay.io/cryostat/cryostat-reports:2.4.0
+                  value: quay.io/cryostat/cryostat-reports:2.4.1-snapshot
                 - name: WATCH_NAMESPACE
                   valueFrom:
                     fieldRef:
@@ -1112,8 +1112,8 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/cryostat/cryostat-operator:2.4.0
-                imagePullPolicy: IfNotPresent
+                image: quay.io/cryostat/cryostat-operator:2.4.1-dev
+                imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1219,12 +1219,12 @@ spec:
   provider:
     name: The Cryostat Community
   relatedImages:
-  - image: quay.io/cryostat/cryostat:2.4.0
+  - image: quay.io/cryostat/cryostat:2.4.1-snapshot
     name: core
-  - image: quay.io/cryostat/jfr-datasource:2.4.0
+  - image: quay.io/cryostat/jfr-datasource:2.4.1-snapshot
     name: datasource
-  - image: quay.io/cryostat/cryostat-grafana-dashboard:2.4.0
+  - image: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4
     name: grafana
-  - image: quay.io/cryostat/cryostat-reports:2.4.0
+  - image: quay.io/cryostat/cryostat-reports:2.4.1-snapshot
     name: reports
-  version: 2.4.0
+  version: 2.4.1-dev
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -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

diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml
@@ -69,7 +69,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: quay.io/cryostat/cryostat-operator-scorecard:2.4.0-20230824004852
+    image: quay.io/cryostat/cryostat-operator-scorecard:2.4.1-20231208210900
     labels:
       suite: cryostat
       test: operator-install
@@ -79,7 +79,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
-    image: quay.io/cryostat/cryostat-operator-scorecard:2.4.0-20230824004852
+    image: quay.io/cryostat/cryostat-operator-scorecard:2.4.1-20231208210900
     labels:
       suite: cryostat
       test: cryostat-cr

diff --git a/config/default/image_pull_patch.yaml b/config/default/image_pull_patch.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: "IfNotPresent"
+        imagePullPolicy: "Always"
diff --git a/config/default/image_tag_patch.yaml b/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"
+          value: "quay.io/cryostat/cryostat:2.4.1-snapshot"
         - name: RELATED_IMAGE_DATASOURCE
-          value: "quay.io/cryostat/jfr-datasource:2.4.0"
+          value: "quay.io/cryostat/jfr-datasource:2.4.1-snapshot"
         - name: RELATED_IMAGE_GRAFANA
-          value: "quay.io/cryostat/cryostat-grafana-dashboard:2.4.0"
+          value: "quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.4"
         - name: RELATED_IMAGE_REPORTS
-          value: "quay.io/cryostat/cryostat-reports:2.4.0"
+          value: "quay.io/cryostat/cryostat-reports:2.4.1-snapshot"
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/cryostat/cryostat-operator
-  newTag: 2.4.0
+  newTag: 2.4.1-dev
diff --git a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml b/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
+    containerImage: quay.io/cryostat/cryostat-operator:2.4.1-dev
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {

diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml
@@ -8,7 +8,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: "quay.io/cryostat/cryostat-operator-scorecard:2.4.0-20230824004852"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:2.4.1-20231208210900"
     labels:
       suite: cryostat
       test: operator-install
@@ -18,7 +18,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
-    image: "quay.io/cryostat/cryostat-operator-scorecard:2.4.0-20230824004852"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:2.4.1-20231208210900"
     labels:
       suite: cryostat
       test: cryostat-cr
diff --git a/internal/controllers/const_generated.go b/internal/controllers/const_generated.go
diff --git a/internal/controllers/insights/test/resources.go b/internal/controllers/insights/test/resources.go
@@ -31,7 +31,7 @@ type InsightsTestResources struct {
 	Resources *corev1.ResourceRequirements
 }
 
-const expectedOperatorVersion = "2.4.0"
+const expectedOperatorVersion = "2.4.1-dev"
 
 func (r *InsightsTestResources) NewGlobalPullSecret() *corev1.Secret {
 	config := `{"auths":{"example.com":{"auth":"hello"},"cloud.openshift.com":{"auth":"world"}}}`