From 6ad6cd800cd0677ae0815e155353b27ead132494 Mon Sep 17 00:00:00 2001
From: Diogo Silva <diogo.silva@five9.com>
Date: Wed, 7 Aug 2024 16:01:27 +0100
Subject: [PATCH] fix: add prometheus operator CRDs

---
 bootstrap/argo-cd.yaml                              |  5 +++++
 bootstrap/argo-cd/kustomization.yaml                | 13 -------------
 .../manifests/application-controller-patch.yaml     | 13 -------------
 3 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 bootstrap/argo-cd/manifests/application-controller-patch.yaml

diff --git a/bootstrap/argo-cd.yaml b/bootstrap/argo-cd.yaml
index e19e6ae..9d6edbc 100644
--- a/bootstrap/argo-cd.yaml
+++ b/bootstrap/argo-cd.yaml
@@ -32,6 +32,11 @@ spec:
       selfHeal: true
     syncOptions:
       - allowEmpty=true
+      # Needs server side apply because some
+      # resources are too big to fit in the
+      # lastAppliedConfig annotation
+      # https://argo-cd.readthedocs.io/en/stable/user-guide/sync-options/#server-side-apply
+      - ServerSideApply=true
 status:
   health: {}
   summary: {}
diff --git a/bootstrap/argo-cd/kustomization.yaml b/bootstrap/argo-cd/kustomization.yaml
index 46621dd..93c0a7a 100644
--- a/bootstrap/argo-cd/kustomization.yaml
+++ b/bootstrap/argo-cd/kustomization.yaml
@@ -48,14 +48,6 @@ configMapGenerator:
       # Disable HTTPS redirection
       - server.insecure="true"
 
-replicas:
-  - name: argocd-repo-server
-    count: 2
-  - name: argocd-server
-    count: 2
-  - name: argocd-redis-ha-haproxy
-    count: 3
-
 resources:
   # Prometheus operator CRDs
   - https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.2/bundle.yaml
@@ -65,11 +57,6 @@ resources:
   # ArgoCD Image Updater
   - https://raw.githubusercontent.com/argoproj-labs/argocd-image-updater/stable/manifests/install.yaml
 
-patchesStrategicMerge:
-  # Apply patch to scale up the application controller and enable sharding
-  # https://argo-cd.readthedocs.io/en/stable/operator-manual/high_availability/#argocd-application-controller
-  - manifests/application-controller-patch.yaml
-
 # Our dynamic environment-specific variables are injects in every manifests
 # as annotations (check `kustomize.commonAnnotations` in `project/common.yaml`).
 # So we just need to make a kustomize replacement of the value we want to replace
diff --git a/bootstrap/argo-cd/manifests/application-controller-patch.yaml b/bootstrap/argo-cd/manifests/application-controller-patch.yaml
deleted file mode 100644
index c7df420..0000000
--- a/bootstrap/argo-cd/manifests/application-controller-patch.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: argocd-application-controller
-spec:
-  replicas: 3
-  template:
-    spec:
-      containers:
-        - name: argocd-application-controller
-          env:
-            - name: ARGOCD_CONTROLLER_REPLICAS
-              value: "3"