From dd3c06d9f78f7ab332bb0f55a67c434c4a65839f Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 16 Oct 2026 14:17:36 +0200
Subject: [PATCH 1/4] enable service monitor

---
 charts/argocd-apps/templates/trivy-operator.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/charts/argocd-apps/templates/trivy-operator.yaml b/charts/argocd-apps/templates/trivy-operator.yaml
index 23acb32..0107ed1 100644
--- a/charts/argocd-apps/templates/trivy-operator.yaml
+++ b/charts/argocd-apps/templates/trivy-operator.yaml
@@ -17,6 +17,10 @@ spec:
         operator:
           namespace: trivy-system
           scanJobTimeout: 60m
+      serviceMonitor:
+        enabled: true
+        labels:
+          release: kube-prometheus-stack
   syncPolicy:
     automated:
       # disable self-healing for local env so we can use skaffold

From 4f44d5e750e905b2598ec0ddaa9797020e3118a6 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Tue, 20 Oct 2026 08:34:59 +0200
Subject: [PATCH 2/4] argocd-apps: enable serviceMonitor

---
 charts/argocd-apps/Chart.yaml                    | 2 +-
 charts/argocd-apps/README.md                     | 3 +++
 charts/argocd-apps/templates/trivy-operator.yaml | 9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml
index 12d49c5..8c9c9fa 100644
--- a/charts/argocd-apps/Chart.yaml
+++ b/charts/argocd-apps/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-apps
 description: Chart to deploy WBaaS apps in an "app-of-apps" pattern via ArgoCD
 type: application
-version: 2.3.0
+version: 2.4.0
 appVersion: "1.0"
 maintainers:
   - name: WBstack
diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md
index 0ee39b7..a721d4d 100644
--- a/charts/argocd-apps/README.md
+++ b/charts/argocd-apps/README.md
@@ -3,6 +3,9 @@
 Deploys actual `Application` manifests for Argo CD. This chart gets treated as it's own `Application`, the app-of-apps, by the chart [argocd-config](../argocd-config/README.md).
 
 ## Changelog
+## 2.4.0
+- enable trivy operator serviceMonitor
+
 ## 2.3.0
 - add trivy operator to local and production
 
diff --git a/charts/argocd-apps/templates/trivy-operator.yaml b/charts/argocd-apps/templates/trivy-operator.yaml
index 0107ed1..26e5510 100644
--- a/charts/argocd-apps/templates/trivy-operator.yaml
+++ b/charts/argocd-apps/templates/trivy-operator.yaml
@@ -17,10 +17,11 @@ spec:
         operator:
           namespace: trivy-system
           scanJobTimeout: 60m
-      serviceMonitor:
-        enabled: true
-        labels:
-          release: kube-prometheus-stack
+        serviceMonitor:
+          enabled: true
+          interval: 2m
+          labels:
+            release: kube-prometheus-stack
   syncPolicy:
     automated:
       # disable self-healing for local env so we can use skaffold

From eeb4f9cfd40b52687ed5611ff9efed7540f90702 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Tue, 20 Oct 2026 11:13:27 +0200
Subject: [PATCH 3/4] move values to deploy repo

---
 charts/argocd-apps/templates/trivy-operator.yaml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/charts/argocd-apps/templates/trivy-operator.yaml b/charts/argocd-apps/templates/trivy-operator.yaml
index 26e5510..a1d8074 100644
--- a/charts/argocd-apps/templates/trivy-operator.yaml
+++ b/charts/argocd-apps/templates/trivy-operator.yaml
@@ -13,15 +13,8 @@ spec:
     targetRevision: {{ .Values.chartVersions.trivyOperator }}
     chart: trivy-operator
     helm:
-      valuesObject:
-        operator:
-          namespace: trivy-system
-          scanJobTimeout: 60m
-        serviceMonitor:
-          enabled: true
-          interval: 2m
-          labels:
-            release: kube-prometheus-stack
+      valueFiles:
+        - $deployRepo/k8s/argocd/{{ .Values.environment }}/trivy-operator.values.yaml
   syncPolicy:
     automated:
       # disable self-healing for local env so we can use skaffold

From 31b52fc53a163b90cdbd9994a3c7287f70ce52e1 Mon Sep 17 00:00:00 2001
From: dena <91744937+deer-wmde@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:06:16 +0200
Subject: [PATCH 4/4] Update charts/argocd-apps/README.md

Co-authored-by: Thomas Arrow <tarrow@users.noreply.github.com>
---
 charts/argocd-apps/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md
index a721d4d..1a007ff 100644
--- a/charts/argocd-apps/README.md
+++ b/charts/argocd-apps/README.md
@@ -5,6 +5,7 @@ Deploys actual `Application` manifests for Argo CD. This chart gets treated as i
 ## Changelog
 ## 2.4.0
 - enable trivy operator serviceMonitor
+- read trivy values from deploy repo
 
 ## 2.3.0
 - add trivy operator to local and production