From db561c6b0e3592c2692c87680be06a094a104e11 Mon Sep 17 00:00:00 2001
From: Erich Blume <blume.erich@gmail.com>
Date: Thu, 26 Feb 2026 06:51:50 -0800
Subject: [PATCH] =?UTF-8?q?Upgrade=20ArgoCD=20v3.2.6=20=E2=86=92=20v3.3.2?=
 =?UTF-8?q?=20with=20Server-Side=20Apply=20(#272)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary
- Upgrade ArgoCD from v3.2.6 to v3.3.2
- Enable `ServerSideApply=true` sync option (required by v3.3 — ApplicationSet CRD exceeds client-side apply annotation limit)
- Update service-versions.yaml with review for argocd and 1password-connect

## Breaking changes reviewed
- **Server-Side Apply required**: Added to syncOptions ✅
- **Source Hydrator git notes**: Not used — N/A
- **Application path cleaning removed**: Not used — N/A
- **Settings API field restriction**: Authenticated access only — N/A

## Deployment and Testing
- [ ] Sync the `apps` app first (picks up SSA syncOption change)
- [ ] `argocd app set argocd --revision feature/argocd-v3.3.2`
- [ ] `argocd app sync argocd`
- [ ] Verify all argocd pods running with v3.3.2 images
- [ ] Verify other apps still sync correctly
- [ ] After merge: `argocd app set argocd --revision main && argocd app sync argocd`

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Reviewed-on: https://forge.ops.eblu.me/eblume/blumeops/pulls/272
---
 argocd/apps/argocd.yaml                         |  1 +
 argocd/manifests/argocd/kustomization.yaml      |  2 +-
 docs/changelog.d/feature-argocd-v3.3.2.infra.md |  1 +
 service-versions.yaml                           | 13 +++++++------
 4 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 docs/changelog.d/feature-argocd-v3.3.2.infra.md

diff --git a/argocd/apps/argocd.yaml b/argocd/apps/argocd.yaml
index c5e89e8..63f7ff8 100644
--- a/argocd/apps/argocd.yaml
+++ b/argocd/apps/argocd.yaml
@@ -17,3 +17,4 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/argocd/manifests/argocd/kustomization.yaml b/argocd/manifests/argocd/kustomization.yaml
index d1d3ed6..a829c7d 100644
--- a/argocd/manifests/argocd/kustomization.yaml
+++ b/argocd/manifests/argocd/kustomization.yaml
@@ -5,7 +5,7 @@ namespace: argocd
 
 resources:
   # Pin to specific version for intentional upgrades
-  - https://raw.githubusercontent.com/argoproj/argo-cd/v3.2.6/manifests/install.yaml
+  - https://raw.githubusercontent.com/argoproj/argo-cd/v3.3.2/manifests/install.yaml
   - ingress-tailscale.yaml
   - external-secret-repo-forge.yaml
 
diff --git a/docs/changelog.d/feature-argocd-v3.3.2.infra.md b/docs/changelog.d/feature-argocd-v3.3.2.infra.md
new file mode 100644
index 0000000..3b1c3fc
--- /dev/null
+++ b/docs/changelog.d/feature-argocd-v3.3.2.infra.md
@@ -0,0 +1 @@
+Upgrade ArgoCD from v3.2.6 to v3.3.2 with Server-Side Apply enabled
diff --git a/service-versions.yaml b/service-versions.yaml
index 40725c7..7e3984c 100644
--- a/service-versions.yaml
+++ b/service-versions.yaml
@@ -110,16 +110,17 @@ services:
 
   - name: 1password-connect
     type: argocd
-    last-reviewed: null
-    current-version: null
-    upstream-source: https://github.com/1Password/connect/releases
-    notes: Deployed via Helm chart
+    last-reviewed: 2026-02-26
+    current-version: "1.8.1"
+    upstream-source: https://hub.docker.com/r/1password/connect-api/tags
+    notes: Deployed via Helm chart (chart v2.3.0)
 
   - name: argocd
     type: argocd
-    last-reviewed: null
-    current-version: null
+    last-reviewed: 2026-02-26
+    current-version: "v3.3.2"
     upstream-source: https://github.com/argoproj/argo-cd/releases
+    notes: Kustomize-based install with ServerSideApply
 
   - name: blumeops-pg
     type: argocd