From d378a8c70ddc0a94e72c155998aa0aceabdb7729 Mon Sep 17 00:00:00 2001
From: Nikholas Pcenicni <82239765+nikpcenicni@users.noreply.github.com>
Date: Wed, 13 May 2026 17:35:43 -0400
Subject: [PATCH] Add ServerSideApply option to Argo CD application
 configurations for improved deployment management

---
 .../bootstrap/argocd/app-of-apps/cert-manager-application.yaml | 1 +
 .../noble/bootstrap/argocd/app-of-apps/cilium-application.yaml | 1 +
 .../app-of-apps/csi-snapshot-controller-application.yaml       | 3 +++
 .../argocd/app-of-apps/csi-snapshot-crds-application.yaml      | 3 +++
 .../bootstrap/argocd/app-of-apps/fluent-bit-application.yaml   | 1 +
 .../bootstrap/argocd/app-of-apps/headlamp-application.yaml     | 1 +
 .../bootstrap/argocd/app-of-apps/kube-vip-application.yaml     | 3 +++
 .../bootstrap/argocd/app-of-apps/kyverno-application.yaml      | 1 +
 .../argocd/app-of-apps/kyverno-policies-application.yaml       | 1 +
 .../noble/bootstrap/argocd/app-of-apps/loki-application.yaml   | 1 +
 .../bootstrap/argocd/app-of-apps/longhorn-application.yaml     | 2 ++
 .../bootstrap/argocd/app-of-apps/metallb-application.yaml      | 1 +
 .../argocd/app-of-apps/metrics-server-application.yaml         | 1 +
 .../bootstrap/argocd/app-of-apps/traefik-application.yaml      | 1 +
 14 files changed, 21 insertions(+)

diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/cert-manager-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/cert-manager-application.yaml
index a7d4a15..7bdba2f 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/cert-manager-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/cert-manager-application.yaml
@@ -29,3 +29,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/cilium-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/cilium-application.yaml
index a5d51a9..5ce8b8c 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/cilium-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/cilium-application.yaml
@@ -26,3 +26,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/csi-snapshot-controller-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/csi-snapshot-controller-application.yaml
index 9d26a22..a1f8a71 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/csi-snapshot-controller-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/csi-snapshot-controller-application.yaml
@@ -16,3 +16,6 @@ spec:
     server: https://kubernetes.default.svc
     namespace: kube-system
   # Manual sync: Ansible applies first; enable automation after cutover (see ../README.md §5).
+  syncPolicy:
+    syncOptions:
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/csi-snapshot-crds-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/csi-snapshot-crds-application.yaml
index 5705fe8..768d30a 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/csi-snapshot-crds-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/csi-snapshot-crds-application.yaml
@@ -16,3 +16,6 @@ spec:
     server: https://kubernetes.default.svc
     namespace: kube-system
   # Manual sync: Ansible applies first; enable automation after cutover (see ../README.md §5).
+  syncPolicy:
+    syncOptions:
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/fluent-bit-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/fluent-bit-application.yaml
index f9cdaa1..ebea249 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/fluent-bit-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/fluent-bit-application.yaml
@@ -26,3 +26,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/headlamp-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/headlamp-application.yaml
index 48fb75f..c4a2749 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/headlamp-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/headlamp-application.yaml
@@ -26,3 +26,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/kube-vip-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/kube-vip-application.yaml
index 263a554..3d779e6 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/kube-vip-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/kube-vip-application.yaml
@@ -16,3 +16,6 @@ spec:
     server: https://kubernetes.default.svc
     namespace: kube-system
   # Manual sync: Ansible applies first; enable automation after cutover (see ../README.md §5).
+  syncPolicy:
+    syncOptions:
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/kyverno-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/kyverno-application.yaml
index fa0b8fb..c0f4f96 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/kyverno-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/kyverno-application.yaml
@@ -26,3 +26,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/kyverno-policies-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/kyverno-policies-application.yaml
index 1b220e2..f385f69 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/kyverno-policies-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/kyverno-policies-application.yaml
@@ -26,3 +26,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/loki-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/loki-application.yaml
index 4971bd7..7fdcb3a 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/loki-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/loki-application.yaml
@@ -26,3 +26,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/longhorn-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/longhorn-application.yaml
index d536d5c..ce5d460 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/longhorn-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/longhorn-application.yaml
@@ -26,6 +26,8 @@ spec:
     server: https://kubernetes.default.svc
     namespace: longhorn-system
   # Manual sync: Ansible helm runs first; enable automation after cutover (see ../README.md §5).
+  # ServerSideApply: avoids oversized last-applied-configuration on large Longhorn CRDs/manifests.
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/metallb-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/metallb-application.yaml
index 26a05bc..9df2d92 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/metallb-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/metallb-application.yaml
@@ -24,3 +24,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/metrics-server-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/metrics-server-application.yaml
index 22996d8..9a2de54 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/metrics-server-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/metrics-server-application.yaml
@@ -26,3 +26,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/traefik-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/traefik-application.yaml
index 476d30e..3ce9261 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/traefik-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/traefik-application.yaml
@@ -26,3 +26,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true