ci(staging): deploy sorcerer 5db33158-debug

Reviewed-on: #217

charts/atlantis/Chart.yaml

@@ -4,10 +4,10 @@ description: Atlantis map and simulation service
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: v2.6.6
+version: v1.42.25
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: v2.6.6
+appVersion: v1.42.25
 dependencies:
   - name: diagrid-dashboard
     version: "0.1.0"

charts/atlantis/values.yaml

@@ -4,7 +4,7 @@
 replicaCount: 1
 image:
   repository: git.oceanbox.io/oceanbox/poseidon/atlantis
-  tag: v2.6.6
+  tag: v1.42.25
   pullPolicy: IfNotPresent
 init:
   enabled: false

charts/codex/Chart.yaml

@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v2.6.6
+version: v2.9.4
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.6.6"
+appVersion: "v2.9.4"

charts/codex/values.yaml

@@ -10,7 +10,7 @@ image:
   # This sets the pull policy for images.
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v2.6.6
+  tag: v2.9.4
 # This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
 imagePullSecrets:
   - name: gitlab-pull-secret

charts/sorcerer/Chart.yaml

@@ -4,10 +4,10 @@ description: A Helm chart for Kubernetes
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: v2.6.6
+version: v1.42.25
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: v2.6.6
+appVersion: v1.42.25
 dependencies:
   - name: diagrid-dashboard
     version: "0.1.0"

charts/sorcerer/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 image:
   repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
-  tag: v2.6.6
+  tag: v1.42.25
   pullPolicy: IfNotPresent
 init:
   enabled: false

helmfile.d/argo.yaml.gotmpl

@@ -15,7 +15,7 @@ releases:
 - name: argocd
   namespace: argocd
   chart: argo/argo-cd
-  version: 9.5.12
+  version: 9.5.15
   condition: argo.enabled
   values:
   - ../values/argo/values/argocd.yaml.gotmpl
@@ -27,7 +27,7 @@ releases:
 - name: argocd-apps
   namespace: argocd
   chart: argo/argocd-apps
-  version: 2.0.4
+  version: 2.0.5
   condition: argo.apps.enabled
   values:
   - ../values/argo/values/apps.yaml.gotmpl
@@ -43,7 +43,7 @@ releases:
 - name: argo-workflows
   namespace: argocd
   chart: argo/argo-workflows
-  version: 1.0.13
+  version: 1.0.14
   condition: argo.workflows.enabled
   missingFileHandler: Info
 - name: manifests

helmfile.d/kyverno.yaml.gotmpl

@@ -15,7 +15,7 @@ releases:
 - name: kyverno
   namespace: kyverno
   chart: kyverno/kyverno
-  version: 3.8.0
+  version: 3.8.1
   condition: kyverno.enabled
   values:
   - ../values/kyverno/values/kyverno.yaml.gotmpl

helmfile.d/openfga.yaml.gotmpl

@@ -16,7 +16,7 @@ releases:
   namespace: {{ .Environment.Name }}-openfga
   {{- end }}
   chart: openfga/openfga
-  version: 0.3.3
+  version: 0.3.5
   condition: openfga.enabled
   values:
   - ../values/openfga/values/values.yaml

helmfile.d/opentelemetry-collector.yaml.gotmpl

@@ -12,7 +12,7 @@ releases:
 - name: opentelemetry-collector
   namespace: otel
   chart: open-telemetry/opentelemetry-collector
-  version: 0.153.0
+  version: 0.156.2
   condition: otel.enabled
   values:
   - ../values/opentelemetry-collector/values/values.yaml

helmfile.d/postgres-operator.yaml.gotmpl

@@ -15,7 +15,7 @@ releases:
 - name: postgres-operator
   namespace: cnpg
   chart: cloudnative-pg/cloudnative-pg
-  version: 0.28.0
+  version: 0.28.2
   condition: postgres_operator.enabled
   values:
   - ../values/postgres-operator/values/postgres-operator.yaml.gotmpl

helmfile.d/prometheus.yaml.gotmpl

@@ -15,7 +15,7 @@ releases:
 - name: prometheus
   namespace: prometheus
   chart: prometheus/kube-prometheus-stack
-  version: 82.15.1
+  version: 85.3.0
   condition: prometheus.enabled
   values:
   - ../values/prometheus/values/prometheus.yaml.gotmpl

helmfile.d/umami.yaml.gotmpl

@@ -14,7 +14,7 @@ releases:
 - name: umami
   namespace: analytics
   chart: umami/umami
-  version: 7.9.1
+  version: 7.9.4
   condition: umami.enabled
   values:
   - ../values/umami/values/values.yaml

helmfile.d/x509-exporter.yaml.gotmpl

@@ -3,7 +3,8 @@ bases:
 
 repositories:
   - name: x509-exporter
-    url: 'https://charts.enix.io'
+    oci: true
+    url: 'quay.io/enix/charts'
 
 commonLabels:
   tier: sys
@@ -12,7 +13,7 @@ releases:
 - name: x509-exporter
   namespace: x509-exporter
   chart: x509-exporter/x509-certificate-exporter
-  version: 3.21.0
+  version: 4.1.0
   condition: x509_exporter.enabled
   values:
   - ../values/x509-exporter/values/x509-exporter.yaml.gotmpl

values/argo/manifests/sys-project.yaml

@@ -141,6 +141,7 @@ spec:
   - ghcr.io/spegel-org/helm-charts
   - quay.io/cilium/charts
   - quay.io/jetstack/charts
+  - quay.io/enix/charts
   - registry.k8s.io/jobset/charts/jobset
   - ghcr.io/dragonflydb/dragonfly-operator/helm/dragonfly-operator
   - docker.gitea.com

values/atlantis/kustomize/beta/actor-config.yaml

@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: beta-atlantis-actor-config
 data:
-  XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
+  KUEUE_NAMESPACE: "prod-queue"
+  XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.14"
   XTRACT_QUEUE: "prod-queue"
-  PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
+  PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.14"
   PLUME_QUEUE: "prod-queue"

values/atlantis/kustomize/prod/actor-config.yaml

@@ -3,6 +3,7 @@ kind: ConfigMap
 metadata:
   name: prod-atlantis-actor-config
 data:
+  KUEUE_NAMESPACE: "prod-queue"
   XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
   XTRACT_QUEUE: "prod-queue"
   PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"

values/atlantis/kustomize/staging/actor-config.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: staging-atlantis-actor-config
 data:
-  XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.12"
+  XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.4.0"
   XTRACT_QUEUE: "dev-queue"
-  PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.12"
+  PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.4.0"
   PLUME_QUEUE: "dev-queue"

values/atlantis/values/values-beta.yaml.gotmpl

@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: git.oceanbox.io/oceanbox/poseidon/atlantis
-  tag: v2.6.6
+  tag: v2.9.4
 
 podAnnotations:
   dapr.io/app-id: "beta-atlantis"
@@ -11,7 +11,7 @@ env:
   - name: APP_NAMESPACE
     value: beta-atlantis
   - name: APP_VERSION
-    value: "2.6.6-beta"
+    value: "2.9.4-beta"
   - name: LOG_LEVEL
     value: "1"
   - name: ANALYTICS_WEB_ID

values/atlantis/values/values-staging.yaml.gotmpl

@@ -1,7 +1,7 @@
 replicaCount: 1
 image:
   repository: git.oceanbox.io/oceanbox/poseidon/atlantis
-  tag: 0042495a-debug
+  tag: d7525aed-debug
 podAnnotations:
   dapr.io/app-id: "staging-atlantis"
 env:

values/codex/values/values-staging.yaml

@@ -38,4 +38,4 @@ volumeMounts:
     readOnly: true
     subPath: appsettings.json
 image:
-  tag: 0042495a-debug
+  tag: 32f66b86-debug

values/docs/values/values.yaml

@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  tag: "5e339995-debug"
+  tag: "1c160398-debug"
 env:
   - name: APP_VERSION
     value: "0.0.0"

values/gatus/values/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: twinproduction/gatus
-  tag: v5.35.0
+  tag: v5.36.0
 
 # Does envFrom secret named gatus
 secrets: true

values/gitea/values/values.yaml

@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   registry: "docker.gitea.com"
   repository: gitea
-  tag: "1.26.1"
+  tag: "1.26.2"
 
 resources:
   requests:

values/kueue/manifests/sorcerer-queue-access.yaml

@@ -1,3 +1,42 @@
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-prod-queue-ceph-archives
+spec:
+  accessModes:
+  - ReadWriteMany
+  capacity:
+    storage: 1Gi
+  csi:
+    driver: rook-ceph.cephfs.csi.ceph.com
+    nodeStageSecretRef:
+      name: rook-csi-cephfs-node
+      namespace: rook-ceph
+    volumeAttributes:
+      clusterID: rook-ceph
+      fsName: data
+      rootPath: /
+      staticVolume: "true"
+    volumeHandle: pv-prod-queue-ceph-archives
+  persistentVolumeReclaimPolicy: Retain
+  volumeMode: Filesystem
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: prod-queue-ceph-archives
+  namespace: prod-queue
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: ""
+  volumeMode: Filesystem
+  volumeName: pv-prod-queue-ceph-archives
+---
 # Cross-namespace RBAC: allow sorcerer ServiceAccounts to manage JobSets in dev-queue
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

values/sorcerer/kustomize/beta-ekman/deployment_patch.yaml

@@ -21,7 +21,7 @@
   path: /spec/template/spec/containers/0/envFrom/-
   value:
     secretRef:
-      name: prod-sorcerer-env
+      name: beta-sorcerer-env
 - op: add
   path: /spec/template/spec/containers/0/envFrom/-
   value:

values/sorcerer/values/values-beta-ekman.yaml

@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
-  tag: v2.6.6
+  tag: v2.9.4
 
 podAnnotations:
   dapr.io/enabled: "true"
@@ -19,7 +19,7 @@ podAnnotations:
 
 env:
   - name: APP_VERSION
-    value: "2.6.6-beta"
+    value: "2.9.4-beta"
   - name: LOG_LEVEL
     value: "1"
   - name: REDIS_USER

values/sorcerer/values/values-staging.yaml

@@ -1,7 +1,7 @@
 replicaCount: 1
 image:
   repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
-  tag: 0042495a-debug
+  tag: 5db33158-debug
 podAnnotations:
   dapr.io/enabled: "true"
   dapr.io/app-id: "staging-sorcerer"

values/umami/queries/weekly-sim-submit-count-norm.sql

@@ -23,8 +23,8 @@ SELECT
   *
 FROM
   crosstab(
-    'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count_v2 ORDER BY 1, 2',
-    'SELECT DISTINCT sim_type FROM weekly_sim_submit_count_v2 ORDER BY 1'
+    'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1, 2',
+    'SELECT DISTINCT sim_type FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1'
   ) AS ct (
     group_name text,
     lice bigint,
@@ -33,3 +33,9 @@ FROM
     virus bigint,
     watercontact bigint
   )
+WHERE
+  (lice + sedimentation + transport + virus + watercontact) <> 0
+  AND "group" <> '@oceanbox.io'
+ORDER BY
+  (lice + sedimentation + transport + virus + watercontact) DESC
+;

values/umami/queries/weekly-users.sql

@@ -9,9 +9,11 @@ WITH base AS (
   WHERE
     w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
     AND w.event_type = 1
-    AND w.created_at BETWEEN '2025-10-13' AND '2025-10-19'
+    -- NOTE: This is only available in grafana
+    -- AND $__timeFilter(w.created_at)
+    AND w.created_at BETWEEN current_timestamp - '7 days'::interval and current_timestamp
     AND s.distinct_id IS NOT NULL
-    -- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ('@leroyseafood.com')
+    -- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ($groups)
 ),
 unique_totals AS (
   SELECT
@@ -28,9 +30,12 @@ unique_users AS (
   GROUP BY "Group"
 )
 SELECT
-	SUM("Users in range")
-FROM
-	unique_totals
+  t."Group",
+  t."Users in range" AS "Weekly users"
+FROM unique_totals t
+LEFT JOIN
+  unique_users u USING ("Group")
 WHERE
-	LOWER("Group") NOT IN ('@oceanbox.io')
-	;
+  t."Group" <> '@oceanbox.io'
+ORDER BY
+  "Users in range" DESC;

values/umami/queries/weekly.sql

@@ -14,6 +14,10 @@ WHERE
 	AND w.event_type = 1
 	AND s.distinct_id IS NOT NULL
 	AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') <> '@oceanbox.io'
+	AND 2025 < EXTRACT(YEAR FROM w.created_at) 
+	-- NOTE(simkir): We started with umami at this time, so the data that week was not complete
+	AND (NOT (EXTRACT(YEAR FROM w.created_at) = 2025 AND EXTRACT(WEEK FROM w.created_at) = 37))
+	AND (NOT (EXTRACT(YEAR FROM w.created_at) = 2025 AND EXTRACT(WEEK FROM w.created_at) = 1))
 GROUP BY
   week
 ORDER BY