From 1ce61eccb9d023e6ddb9e0d582ab2afacdf5e40a Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Thu, 15 Jan 2026 21:18:47 +0200
Subject: feat: add ignoreDifferences for Argo Rollouts to prevent ArgoCD
 conflicts

---
 f3s/argocd-apps/services/tracing-demo.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/f3s/argocd-apps/services/tracing-demo.yaml b/f3s/argocd-apps/services/tracing-demo.yaml
index c9283a6..dd43b01 100644
--- a/f3s/argocd-apps/services/tracing-demo.yaml
+++ b/f3s/argocd-apps/services/tracing-demo.yaml
@@ -20,7 +20,6 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=false
-      # Ignore old Deployment resources (using Rollout instead)
       - RespectIgnoreDifferences=true
     retry:
       limit: 3
@@ -28,3 +27,14 @@ spec:
         duration: 5s
         factor: 2
         maxDuration: 1m
+  ignoreDifferences:
+  # Let Argo Rollouts manage Rollout runtime state
+  - group: argoproj.io
+    kind: Rollout
+    jsonPointers:
+    # Ignore template env vars (kubectl patch adds env vars for triggering)
+    - /spec/template/spec/containers/0/env
+    - /spec/template/spec/containers/1/env
+    - /spec/template/spec/containers/2/env
+    # Ignore status fields (Argo Rollouts manages these)
+    - /status
-- 
cgit v1.2.3