cryostatio · andrewazores · Dec 20, 2024 · Sep 20, 2024 · Sep 20, 2024 · Sep 20, 2024
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 ?= 3.0.1
+export OPERATOR_VERSION ?= 3.0.2-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.1
+CORE_VERSION ?= 3.0.2-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.1
+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.1
+DATASOURCE_VERSION ?= 3.0.2-snapshot
 export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION)
 GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 GRAFANA_NAME ?= cryostat-grafana-dashboard
-GRAFANA_VERSION ?= 3.0.1
+GRAFANA_VERSION ?= 3.0
 export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION)
 REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 REPORTS_NAME ?= cryostat-reports
-REPORTS_VERSION ?= 3.0.1
+REPORTS_VERSION ?= 3.0.2-snapshot
 export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION)
 DATABASE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 DATABASE_NAME ?= cryostat-db
-DATABASE_VERSION ?= 3.0.1
+DATABASE_VERSION ?= 3.0
 export DATABASE_IMG ?= $(DATABASE_NAMESPACE)/$(DATABASE_NAME):$(DATABASE_VERSION)
 STORAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE)
 STORAGE_NAME ?= cryostat-storage
-STORAGE_VERSION ?= 3.0.1
+STORAGE_VERSION ?= 3.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.1-$(shell date -u '+%Y%m%d%H%M%S')
+CUSTOM_SCORECARD_VERSION ?= 3.0.2-$(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
@@ -29,8 +29,8 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
-    containerImage: quay.io/cryostat/cryostat-operator:3.0.1
-    createdAt: "2024-09-20T18:43:56Z"
+    containerImage: quay.io/cryostat/cryostat-operator:3.0.2-dev
+    createdAt: "2024-09-20T19:04:07Z"
     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.1
+  name: cryostat-operator.v3.0.2-dev
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -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:3.0.1
+                        value: quay.io/cryostat/openshift-oauth-proxy:3.0
                       - name: RELATED_IMAGE_CORE
-                        value: quay.io/cryostat/cryostat:3.0.1
+                        value: quay.io/cryostat/cryostat:3.0.2-snapshot
                       - name: RELATED_IMAGE_DATASOURCE
-                        value: quay.io/cryostat/jfr-datasource:3.0.1
+                        value: quay.io/cryostat/jfr-datasource:3.0.2-snapshot
                       - name: RELATED_IMAGE_GRAFANA
-                        value: quay.io/cryostat/cryostat-grafana-dashboard:3.0.1
+                        value: quay.io/cryostat/cryostat-grafana-dashboard:3.0
                       - name: RELATED_IMAGE_REPORTS
-                        value: quay.io/cryostat/cryostat-reports:3.0.1
+                        value: quay.io/cryostat/cryostat-reports:3.0.2-snapshot
                       - name: RELATED_IMAGE_STORAGE
-                        value: quay.io/cryostat/cryostat-storage:3.0.1
+                        value: quay.io/cryostat/cryostat-storage:3.0
                       - name: RELATED_IMAGE_DATABASE
-                        value: quay.io/cryostat/cryostat-db:3.0.1
+                        value: quay.io/cryostat/cryostat-db:3.0
                       - name: WATCH_NAMESPACE
                         valueFrom:
                           fieldRef:
@@ -1018,8 +1018,8 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.namespace
-                    image: quay.io/cryostat/cryostat-operator:3.0.1
-                    imagePullPolicy: IfNotPresent
+                    image: quay.io/cryostat/cryostat-operator:3.0.2-dev
+                    imagePullPolicy: Always
                     livenessProbe:
                       httpGet:
                         path: /healthz
@@ -1165,21 +1165,21 @@ spec:
   relatedImages:
     - image: quay.io/oauth2-proxy/oauth2-proxy:latest
       name: oauth2-proxy
-    - image: quay.io/cryostat/openshift-oauth-proxy:3.0.1
+    - image: quay.io/cryostat/openshift-oauth-proxy:3.0
       name: openshift-oauth-proxy
-    - image: quay.io/cryostat/cryostat:3.0.1
+    - image: quay.io/cryostat/cryostat:3.0.2-snapshot
       name: core
-    - image: quay.io/cryostat/jfr-datasource:3.0.1
+    - image: quay.io/cryostat/jfr-datasource:3.0.2-snapshot
       name: datasource
-    - image: quay.io/cryostat/cryostat-grafana-dashboard:3.0.1
+    - image: quay.io/cryostat/cryostat-grafana-dashboard:3.0
       name: grafana
-    - image: quay.io/cryostat/cryostat-reports:3.0.1
+    - image: quay.io/cryostat/cryostat-reports:3.0.2-snapshot
       name: reports
-    - image: quay.io/cryostat/cryostat-storage:3.0.1
+    - image: quay.io/cryostat/cryostat-storage:3.0
       name: storage
-    - image: quay.io/cryostat/cryostat-db:3.0.1
+    - image: quay.io/cryostat/cryostat-db:3.0
       name: database
-  version: 3.0.1
+  version: 3.0.2-dev
   webhookdefinitions:
     - admissionReviewVersions:
         - v1

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
@@ -70,7 +70,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240911181749
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349
     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.1-20240911181749
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349
     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.1-20240911181749
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349
     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.1-20240911181749
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349
     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.1-20240911181749
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349
     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.1-20240911181749
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349
     labels:
       suite: cryostat
       test: cryostat-report

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
@@ -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.1"
+          value: "quay.io/cryostat/openshift-oauth-proxy:3.0"
         - name: RELATED_IMAGE_CORE
-          value: "quay.io/cryostat/cryostat:3.0.1"
+          value: "quay.io/cryostat/cryostat:3.0.2-snapshot"
         - name: RELATED_IMAGE_DATASOURCE
-          value: "quay.io/cryostat/jfr-datasource:3.0.1"
+          value: "quay.io/cryostat/jfr-datasource:3.0.2-snapshot"
         - name: RELATED_IMAGE_GRAFANA
-          value: "quay.io/cryostat/cryostat-grafana-dashboard:3.0.1"
+          value: "quay.io/cryostat/cryostat-grafana-dashboard:3.0"
         - name: RELATED_IMAGE_REPORTS
-          value: "quay.io/cryostat/cryostat-reports:3.0.1"
+          value: "quay.io/cryostat/cryostat-reports:3.0.2-snapshot"
         - name: RELATED_IMAGE_STORAGE
-          value: "quay.io/cryostat/cryostat-storage:3.0.1"
+          value: "quay.io/cryostat/cryostat-storage:3.0"
         - name: RELATED_IMAGE_DATABASE
-          value: "quay.io/cryostat/cryostat-db:3.0.1"
+          value: "quay.io/cryostat/cryostat-db:3.0"
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -22,4 +22,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/cryostat/cryostat-operator
-  newTag: 3.0.1
+  newTag: 3.0.2-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:3.0.1
+    containerImage: quay.io/cryostat/cryostat-operator:3.0.2-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:3.0.1-20240911181749"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349"
     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.1-20240911181749"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349"
     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.1-20240911181749"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349"
     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.1-20240911181749"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349"
     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.1-20240911181749"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349"
     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.1-20240911181749"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.2-20240920190349"
     labels:
       suite: cryostat
       test: cryostat-report
diff --git a/internal/controllers/const_generated.go b/internal/controllers/const_generated.go