From 8827153ac319b46e110f0e4d3e6360977644f2b7 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@itpartner.no>
Date: Wed, 19 Jun 2024 12:02:18 +0200
Subject: [PATCH] fix: fix atlantis resource diffing and ignores

---
 applications/atlantis-host-resources.yaml | 12 ++++++++----
 applications/atlantis-resources.yaml      |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/applications/atlantis-host-resources.yaml b/applications/atlantis-host-resources.yaml
index f3a75600..6b6facb2 100644
--- a/applications/atlantis-host-resources.yaml
+++ b/applications/atlantis-host-resources.yaml
@@ -3,6 +3,8 @@ kind: Application
 metadata:
   name: atlantis-host-cluster-resources
   namespace: argocd
+  # annotations: # close, but no cigar
+  #   argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
   project: aux
   destination:
@@ -12,16 +14,18 @@ spec:
       prune: false
       selfHeal: false
   ignoreDifferences:
-    - group: v1
-      kind: Secret
+    - kind: Secret
       name: prod-rabbitmq
       jqPathExpressions:
         - '.data'
-    - group: v1
-      kind: Secret
+        - '.metadata.annotations.clone'
+        - '.metadata.labels'
+    - kind: Secret
       name: prod-redis
       jqPathExpressions:
         - '.data'
+        - '.metadata.annotations.clone'
+        - '.metadata.labels'
   sources:
   - repoURL: https://gitlab.com/oceanbox/manifests.git
     targetRevision: main
diff --git a/applications/atlantis-resources.yaml b/applications/atlantis-resources.yaml
index 9284f138..5b43af7d 100644
--- a/applications/atlantis-resources.yaml
+++ b/applications/atlantis-resources.yaml
@@ -1,3 +1,4 @@
+# Currently not in use. Configured via the create-vcluster script.
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata: