chore(version): configure release branch for 4.1 (#271)

ebaron · web-flow · commit dfb215791eb4 · 2025-11-03T15:32:18.000-05:00
* chore(version): configure release branch for 4.1

* Use -dev suffix for appVersion

* Fix chart version in unit tests

* Further fix tests
diff --git a/charts/cryostat/Chart.yaml b/charts/cryostat/Chart.yaml
@@ -4,7 +4,7 @@ description: Securely manage JFR recordings for your containerized Java workload
 
 type: application
 
-version: "2.0.0-dev"
+version: "2.1.0-dev"
 
 kubeVersion: ">= 1.25.0-0"
 
diff --git a/charts/cryostat/README.md b/charts/cryostat/README.md
diff --git a/charts/cryostat/tests/cookie_secret_test.yaml b/charts/cryostat/tests/cookie_secret_test.yaml
@@ -26,7 +26,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: 4.1.0-dev
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
 
   - it: should not create a cookie secret if authentication.cookieSecretName is set
     set:
diff --git a/charts/cryostat/tests/cryostat_deployment_test.yaml b/charts/cryostat/tests/cryostat_deployment_test.yaml
@@ -43,7 +43,7 @@ tests:
       - equal:
           path: metadata.labels
           value:
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/version: "4.1.0-dev"
@@ -462,7 +462,7 @@ tests:
             - ALL
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat-grafana')].image
-          value: "quay.io/cryostat/cryostat-grafana-dashboard:latest"
+          value: "quay.io/cryostat/cryostat-grafana-dashboard:4.1-dev"
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat-grafana')].imagePullPolicy
           value: "Always"
@@ -513,7 +513,7 @@ tests:
             - ALL
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat-jfr-datasource')].image
-          value: "quay.io/cryostat/jfr-datasource:latest"
+          value: "quay.io/cryostat/jfr-datasource:4.1.0-snapshot"
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat-jfr-datasource')].imagePullPolicy
           value: "Always"
diff --git a/charts/cryostat/tests/cryostat_service_test.yaml b/charts/cryostat/tests/cryostat_service_test.yaml
@@ -45,7 +45,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: cryostat
             app.kubernetes.io/part-of: cryostat
 
@@ -108,7 +108,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: cryostat
             app.kubernetes.io/part-of: cryostat
       - equal:
@@ -191,7 +191,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/part-of: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: cryostat
 
   - it: should create a Service with additional user-provided annotations
diff --git a/charts/cryostat/tests/cryostat_tls_secret_test.yaml b/charts/cryostat/tests/cryostat_tls_secret_test.yaml
@@ -33,7 +33,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/part-of: cryostat
             app.kubernetes.io/version: 4.1.0-dev
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
 
   - it: should not create a TLS cert secret if oauth2Proxy.tls.selfSigned.enabled is not set
     set:
diff --git a/charts/cryostat/tests/db_deployment_test.yaml b/charts/cryostat/tests/db_deployment_test.yaml
@@ -42,7 +42,7 @@ tests:
       - equal:
           path: metadata.labels
           value:
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/version: "4.1.0-dev"
@@ -63,7 +63,7 @@ tests:
             - ALL
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat-db')].image
-          value: "quay.io/cryostat/cryostat-db:latest"
+          value: "quay.io/cryostat/cryostat-db:cryostat-v4.1"
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat-db')].imagePullPolicy
           value: "Always"
diff --git a/charts/cryostat/tests/db_pvc_test.yaml b/charts/cryostat/tests/db_pvc_test.yaml
@@ -33,7 +33,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
       - equal:
           path: spec.accessModes
           value:
diff --git a/charts/cryostat/tests/db_secret_test.yaml b/charts/cryostat/tests/db_secret_test.yaml
@@ -30,7 +30,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: 4.1.0-dev
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
 
   - it: should not create a database secret if core.databaseSecretName is set
     set:
diff --git a/charts/cryostat/tests/db_service_test.yaml b/charts/cryostat/tests/db_service_test.yaml
@@ -26,7 +26,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: db
             app.kubernetes.io/part-of: cryostat
 
@@ -56,7 +56,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: db
             app.kubernetes.io/part-of: cryostat
 
diff --git a/charts/cryostat/tests/discovery_clusterrole_test.yaml b/charts/cryostat/tests/discovery_clusterrole_test.yaml
@@ -52,7 +52,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
       - equal:
           path: rules
           value:
diff --git a/charts/cryostat/tests/discovery_clusterrolebinding_test.yaml b/charts/cryostat/tests/discovery_clusterrolebinding_test.yaml
@@ -52,7 +52,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
       - equal:
           path: roleRef
           value:
diff --git a/charts/cryostat/tests/reports_deployment_test.yaml b/charts/cryostat/tests/reports_deployment_test.yaml
@@ -50,7 +50,7 @@ tests:
       - equal:
           path: metadata.labels
           value:
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/version: "4.1.0-dev"
diff --git a/charts/cryostat/tests/reports_secret_test.yaml b/charts/cryostat/tests/reports_secret_test.yaml
@@ -30,7 +30,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/part-of: cryostat
             app.kubernetes.io/version: 4.1.0-dev
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
 
   - it: should not create a database secret if reports.reportsSecretName is set
     set:
diff --git a/charts/cryostat/tests/reports_service_test.yaml b/charts/cryostat/tests/reports_service_test.yaml
@@ -38,7 +38,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/part-of: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: reports
 
   - it: should create a Service targeting the Pod https port when deployed in OpenShift
@@ -74,7 +74,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/part-of: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: reports
 
   - it: should create a Service with additional user-provided annotations
diff --git a/charts/cryostat/tests/role_test.yaml b/charts/cryostat/tests/role_test.yaml
@@ -50,7 +50,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
         documentIndex: 0
       - equal:
           path: metadata.labels
@@ -60,7 +60,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
         documentIndex: 1
 
   - it: should have correct permissions for endpoints, pods, and other resources
diff --git a/charts/cryostat/tests/route_test.yaml b/charts/cryostat/tests/route_test.yaml
@@ -35,7 +35,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
       - equal:
           path: metadata.annotations.hello
           value: "world"
diff --git a/charts/cryostat/tests/storage_deployment_test.yaml b/charts/cryostat/tests/storage_deployment_test.yaml
@@ -42,7 +42,7 @@ tests:
       - equal:
           path: metadata.labels
           value:
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/version: "4.1.0-dev"
@@ -63,7 +63,7 @@ tests:
             - ALL
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat-storage')].image
-          value: "quay.io/cryostat/cryostat-storage:latest"
+          value: "quay.io/cryostat/cryostat-storage:cryostat-v4.1"
       - equal:
           path: spec.template.spec.containers[?(@.name=='cryostat-storage')].imagePullPolicy
           value: "Always"
diff --git a/charts/cryostat/tests/storage_pvc_test.yaml b/charts/cryostat/tests/storage_pvc_test.yaml
@@ -33,7 +33,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
       - equal:
           path: spec.accessModes
           value:
diff --git a/charts/cryostat/tests/storage_secret_test.yaml b/charts/cryostat/tests/storage_secret_test.yaml
@@ -28,7 +28,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: 4.1.0-dev
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
 
   - it: should not create a storage secret if storage.storageSecretName is set
     set:
diff --git a/charts/cryostat/tests/storage_service_test.yaml b/charts/cryostat/tests/storage_service_test.yaml
@@ -26,7 +26,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: storage
             app.kubernetes.io/part-of: cryostat
 
@@ -57,7 +57,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.1.0-dev"
-            helm.sh/chart: cryostat-2.0.0-dev
+            helm.sh/chart: cryostat-2.1.0-dev
             app.kubernetes.io/component: storage
             app.kubernetes.io/part-of: cryostat
 
diff --git a/charts/cryostat/values.schema.json b/charts/cryostat/values.schema.json
@@ -516,7 +516,7 @@
                         "tag": {
                             "type": "string",
                             "description": "Tag for the database container image",
-                            "default": "latest"
+                            "default": "cryostat-v4.1"
                         }
                     }
                 },
@@ -664,7 +664,7 @@
                         "tag": {
                             "type": "string",
                             "description": "Tag for the storage container image",
-                            "default": "latest"
+                            "default": "cryostat-v4.1"
                         }
                     }
                 },
@@ -947,7 +947,7 @@
                         "tag": {
                             "type": "string",
                             "description": "Tag for the Grafana container image",
-                            "default": "latest"
+                            "default": "4.1-dev"
                         }
                     }
                 },
@@ -1045,7 +1045,7 @@
                         "tag": {
                             "type": "string",
                             "description": "Tag for the JFR Data Source container image",
-                            "default": "latest"
+                            "default": "4.1.0-snapshot"
                         }
                     }
                 },
diff --git a/charts/cryostat/values.yaml b/charts/cryostat/values.yaml
@@ -210,7 +210,7 @@ db:
     ## @param db.image.pullPolicy Image pull policy for the database container image
     pullPolicy: Always
     ## @param db.image.tag Tag for the database container image
-    tag: "latest"
+    tag: "cryostat-v4.1"
   provider:
     ## @param db.provider.url URL to the database instance. This can be an in-cluster self-hosted instance with a hostname like db.myapp.local, or it can be an external commercial service. This should be a complete JDBC URL with scheme, host, and port. User authentication information should be provided using a *Secret* and *core.databaseSecretName*. If this URL is not specified then a managed [cryostat-db](https://github.com/cryostatio/cryostat-db) instance will be automatically deployed and configured. If an unmanaged database instance is specified here then other database configuration settings (Pod annotations, Service configurations) do not apply. The database must be a Postgres instance with the pgcrypto extension enabled.
     url: ""
@@ -274,7 +274,7 @@ storage:
     ## @param storage.image.pullPolicy Image pull policy for the storage container image
     pullPolicy: Always
     ## @param storage.image.tag Tag for the storage container image
-    tag: "latest"
+    tag: "cryostat-v4.1"
   ## @param storage.storageSecretName Name of the secret containing the object storage secret access key. This secret must contain a STORAGE_ACCESS_KEY secret which is the object storage secret access key. It must not be updated across chart upgrades, or else the connection between Cryostat components and object storage will not be able to initialize. If using an external S3 provider requiring authentication then this **must** be provided. It is recommended that the secret should be marked as immutable to avoid accidental changes to secret's data. More details: [Kubernetes Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#secret-immutable)
   storageSecretName: ""
   provider:
@@ -376,7 +376,7 @@ grafana:
     ## @param grafana.image.pullPolicy Image pull policy for the Grafana container image
     pullPolicy: Always
     ## @param grafana.image.tag Tag for the Grafana container image
-    tag: "latest"
+    tag: "4.1-dev"
   resources:
     requests:
       ## @param grafana.resources.requests.cpu CPU resource request for the Grafana container. See: [ResourceRequirements](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#resources)
@@ -412,7 +412,7 @@ datasource:
     ## @param datasource.image.pullPolicy Image pull policy for the JFR Data Source container image
     pullPolicy: Always
     ## @param datasource.image.tag Tag for the JFR Data Source container image
-    tag: "latest"
+    tag: "4.1.0-snapshot"
   resources:
     requests:
       ## @param datasource.resources.requests.cpu CPU resource request for the JFR Data Source container. See: [ResourceRequirements](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#resources)
