From bce8ed9473d12c6ed11780e89439d8391bf1f929 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Thu, 20 Nov 2025 06:44:34 -0600
Subject: [PATCH] Argocd server-side-apply

---
 k8s/applications/templates/monitoring.yaml    |  3 ++-
 k8s/argocd/base/applications.yaml             | 23 ++++++++++---------
 .../overlays/production/applications.yaml     |  4 ++--
 k8s/argocd/overlays/staging/applications.yaml |  3 ++-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/k8s/applications/templates/monitoring.yaml b/k8s/applications/templates/monitoring.yaml
index dbbd1ae..d5565ec 100644
--- a/k8s/applications/templates/monitoring.yaml
+++ b/k8s/applications/templates/monitoring.yaml
@@ -16,7 +16,8 @@ spec:
   project: default
   syncPolicy:
     syncOptions:
-      - CreateNamespace=true 
+      - CreateNamespace=true
+      - ServerSideApply=true
     automated: 
       prune: true 
     retry:
diff --git a/k8s/argocd/base/applications.yaml b/k8s/argocd/base/applications.yaml
index 477ce2b..4c6870a 100644
--- a/k8s/argocd/base/applications.yaml
+++ b/k8s/argocd/base/applications.yaml
@@ -11,14 +11,15 @@ spec:
     repoURL: 'git@bitbucket.org:jamkazam/video-iac.git'
     targetRevision: ${BITBUCKET_BRANCH}
   project: default
-  # syncPolicy:
-  #   syncOptions:
-  #     - CreateNamespace=true 
-  #   automated: 
-  #     prune: true 
-  #   retry:
-  #     limit: 5 
-  #     backoff:
-  #       duration: 5s 
-  #       factor: 2 
-  #       maxDuration: 3m 
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
+    automated: 
+      prune: true 
+    retry:
+      limit: 5 
+      backoff:
+        duration: 5s 
+        factor: 2 
+        maxDuration: 3m 
diff --git a/k8s/argocd/overlays/production/applications.yaml b/k8s/argocd/overlays/production/applications.yaml
index b7ee0d0..d61ac01 100644
--- a/k8s/argocd/overlays/production/applications.yaml
+++ b/k8s/argocd/overlays/production/applications.yaml
@@ -16,8 +16,8 @@ spec:
   project: default
   syncPolicy:
     syncOptions:
-      - CreateNamespace=true 
-    automated: 
+      - CreateNamespace=true
+      - ServerSideApply=true    automated: 
       prune: true 
       allowEmpty: false
     retry:
diff --git a/k8s/argocd/overlays/staging/applications.yaml b/k8s/argocd/overlays/staging/applications.yaml
index db146cf..c1d3185 100644
--- a/k8s/argocd/overlays/staging/applications.yaml
+++ b/k8s/argocd/overlays/staging/applications.yaml
@@ -16,7 +16,8 @@ spec:
   project: default
   syncPolicy:
     syncOptions:
-      - CreateNamespace=true 
+      - CreateNamespace=true
+      - ServerSideApply=true
     automated: 
       prune: true 
       allowEmpty: false