Fix comparsion error when using server-side apply

projectsyn · Nov 27, 2024 · 3d6ff50 · 3d6ff50
1 parent 4543443
commit 3d6ff50
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/component/app.jsonnet b/component/app.jsonnet
@@ -6,6 +6,11 @@ local argocd = import 'lib/argocd.libjsonnet';
 
 local syn_project = argocd.Project('syn');
 local default_project = argocd.Project('default') {
+  metadata: {
+    annotations: {
+      'argocd.argoproj.io/compare-options': 'ServerSideDiff=true',
+    },
+  },
   spec: {
     destinations: [ {
       namespace: '*',

diff --git a/tests/golden/defaults/argocd/apps/00_default-project.yaml b/tests/golden/defaults/argocd/apps/00_default-project.yaml
@@ -1,8 +1,8 @@
 apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
-  name: default
-  namespace: syn
+  annotations:
+    argocd.argoproj.io/compare-options: ServerSideDiff=true
 spec:
   clusterResourceWhitelist:
     - group: '*'

diff --git a/tests/golden/openshift/argocd/apps/00_default-project.yaml b/tests/golden/openshift/argocd/apps/00_default-project.yaml
@@ -1,8 +1,8 @@
 apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
-  name: default
-  namespace: syn
+  annotations:
+    argocd.argoproj.io/compare-options: ServerSideDiff=true
 spec:
   clusterResourceWhitelist:
     - group: '*'

diff --git a/tests/golden/params/argocd/apps/00_default-project.yaml b/tests/golden/params/argocd/apps/00_default-project.yaml
@@ -1,8 +1,8 @@
 apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
-  name: default
-  namespace: syn
+  annotations:
+    argocd.argoproj.io/compare-options: ServerSideDiff=true
 spec:
   clusterResourceWhitelist:
     - group: '*'

diff --git a/tests/golden/prometheus/argocd/apps/00_default-project.yaml b/tests/golden/prometheus/argocd/apps/00_default-project.yaml
@@ -1,8 +1,8 @@
 apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
-  name: default
-  namespace: syn
+  annotations:
+    argocd.argoproj.io/compare-options: ServerSideDiff=true
 spec:
   clusterResourceWhitelist:
     - group: '*'