From bc52bfd3f16aa37bf8af1db23cdac6639df93a33 Mon Sep 17 00:00:00 2001
From: Danijel Simeunovic <danijel.simeunovic@trumf.no>
Date: Sat, 7 Feb 2026 21:31:56 +0100
Subject: [PATCH] adjustments to argo apps

---
 argocd/apps/application.yaml                   | 2 +-
 argocd/apps/cert-manager-application.yaml      | 2 +-
 argocd/apps/cluster-resources-application.yaml | 4 ++--
 argocd/apps/fluent-bit.yaml                    | 1 +
 argocd/apps/grafana.yaml                       | 3 ++-
 argocd/apps/kyverno.yaml                       | 1 +
 argocd/apps/loki.yaml                          | 3 ++-
 argocd/apps/prometheus.yaml                    | 3 ++-
 argocd/apps/sealedsecrets.yaml                 | 1 +
 argocd/apps/traefik-application.yaml           | 2 +-
 argocd/apps/trivy.yaml                         | 1 +
 11 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/argocd/apps/application.yaml b/argocd/apps/application.yaml
index e10f5e4..0066a76 100644
--- a/argocd/apps/application.yaml
+++ b/argocd/apps/application.yaml
@@ -38,7 +38,7 @@ spec:
     syncOptions:
     - CreateNamespace=true
     - Validate=true
-    - ServerSideApply=false
+    - ServerSideApply=true
     - Replace=false
     retry:
       limit: 5
diff --git a/argocd/apps/cert-manager-application.yaml b/argocd/apps/cert-manager-application.yaml
index d1b116b..ae4dea5 100644
--- a/argocd/apps/cert-manager-application.yaml
+++ b/argocd/apps/cert-manager-application.yaml
@@ -79,7 +79,7 @@ spec:
     syncOptions:
     - CreateNamespace=true
     - Validate=true
-    - ServerSideApply=false
+    - ServerSideApply=true
     - Replace=false
 
     retry:
diff --git a/argocd/apps/cluster-resources-application.yaml b/argocd/apps/cluster-resources-application.yaml
index c1281a6..8037d13 100644
--- a/argocd/apps/cluster-resources-application.yaml
+++ b/argocd/apps/cluster-resources-application.yaml
@@ -15,7 +15,7 @@ spec:
 
   destination:
     server: https://kubernetes.default.svc
-    namespace: cert-manager
+    namespace: argocd
 
   syncPolicy:
     automated:
@@ -26,7 +26,7 @@ spec:
     syncOptions:
     - CreateNamespace=true
     - Validate=true
-    - ServerSideApply=false
+    - ServerSideApply=true
     - Replace=false
     - ApplyOutOfSyncOnly=false
 
diff --git a/argocd/apps/fluent-bit.yaml b/argocd/apps/fluent-bit.yaml
index b1fd57a..9b65aff 100644
--- a/argocd/apps/fluent-bit.yaml
+++ b/argocd/apps/fluent-bit.yaml
@@ -32,6 +32,7 @@ spec:
       allowEmpty: false
     syncOptions:
     - CreateNamespace=true
+    - Validate=true
     - ServerSideApply=true
     retry:
       limit: 5
diff --git a/argocd/apps/grafana.yaml b/argocd/apps/grafana.yaml
index f68ebc3..326758a 100644
--- a/argocd/apps/grafana.yaml
+++ b/argocd/apps/grafana.yaml
@@ -11,7 +11,7 @@ spec:
   sources:
   - repoURL: https://grafana.github.io/helm-charts
     chart: grafana
-    targetRevision: latest
+    targetRevision: "8.0.0"
     helm:
       releaseName: grafana
       valueFiles:
@@ -32,6 +32,7 @@ spec:
       allowEmpty: false
     syncOptions:
     - CreateNamespace=true
+    - Validate=true
     - ServerSideApply=true
     retry:
       limit: 5
diff --git a/argocd/apps/kyverno.yaml b/argocd/apps/kyverno.yaml
index 3509f00..f873bbe 100644
--- a/argocd/apps/kyverno.yaml
+++ b/argocd/apps/kyverno.yaml
@@ -26,6 +26,7 @@ spec:
       allowEmpty: false
     syncOptions:
     - CreateNamespace=true
+    - Validate=true
     - ServerSideApply=true
     retry:
       limit: 5
diff --git a/argocd/apps/loki.yaml b/argocd/apps/loki.yaml
index 7d5799e..95f2df1 100644
--- a/argocd/apps/loki.yaml
+++ b/argocd/apps/loki.yaml
@@ -11,7 +11,7 @@ spec:
   sources:
   - repoURL: https://grafana.github.io/helm-charts
     chart: loki
-    targetRevision: latest
+    targetRevision: "6.0.0"
     helm:
       releaseName: loki
       valueFiles:
@@ -32,6 +32,7 @@ spec:
       allowEmpty: false
     syncOptions:
     - CreateNamespace=true
+    - Validate=true
     - ServerSideApply=true
     retry:
       limit: 5
diff --git a/argocd/apps/prometheus.yaml b/argocd/apps/prometheus.yaml
index 805988f..71d4f02 100644
--- a/argocd/apps/prometheus.yaml
+++ b/argocd/apps/prometheus.yaml
@@ -11,7 +11,7 @@ spec:
   sources:
   - repoURL: https://prometheus-community.github.io/helm-charts
     chart: prometheus
-    targetRevision: latest
+    targetRevision: "65.0.0"
     helm:
       releaseName: prometheus
       valueFiles:
@@ -32,6 +32,7 @@ spec:
       allowEmpty: false
     syncOptions:
     - CreateNamespace=true
+    - Validate=true
     - ServerSideApply=true
     retry:
       limit: 5
diff --git a/argocd/apps/sealedsecrets.yaml b/argocd/apps/sealedsecrets.yaml
index bffbf37..4b18ad7 100644
--- a/argocd/apps/sealedsecrets.yaml
+++ b/argocd/apps/sealedsecrets.yaml
@@ -29,6 +29,7 @@ spec:
       allowEmpty: false
     syncOptions:
     - CreateNamespace=false # kube-system already exists
+    - Validate=true
     - ServerSideApply=true
     retry:
       limit: 5
diff --git a/argocd/apps/traefik-application.yaml b/argocd/apps/traefik-application.yaml
index 6c32a15..4be9b80 100644
--- a/argocd/apps/traefik-application.yaml
+++ b/argocd/apps/traefik-application.yaml
@@ -54,7 +54,7 @@ spec:
     syncOptions:
     - CreateNamespace=true
     - Validate=true
-    - ServerSideApply=false
+    - ServerSideApply=true
     - Replace=false
 
     retry:
diff --git a/argocd/apps/trivy.yaml b/argocd/apps/trivy.yaml
index b7ff8f5..8390d17 100644
--- a/argocd/apps/trivy.yaml
+++ b/argocd/apps/trivy.yaml
@@ -29,6 +29,7 @@ spec:
       allowEmpty: false
     syncOptions:
     - CreateNamespace=false # kube-system already exists
+    - Validate=true
     - ServerSideApply=true
     retry:
       limit: 5