From 7a0a54b60b59236582736807a4c5d3441ae5668b Mon Sep 17 00:00:00 2001
From: juvdiaz <juvenal.diaz@oracle.com>
Date: Thu, 2 Jul 2026 21:20:14 -0600
Subject: [PATCH] untrim srgocd after adding 2nd worker

---
 bootstrap/platform/main.tf | 71 +++++++++++++++++++++++++++++---------
 1 file changed, 55 insertions(+), 16 deletions(-)

diff --git a/bootstrap/platform/main.tf b/bootstrap/platform/main.tf
index 2796ffe..c6d76df 100644
--- a/bootstrap/platform/main.tf
+++ b/bootstrap/platform/main.tf
@@ -1105,7 +1105,19 @@ resource "helm_release" "argocd" {
         }
       }
       applicationSet = {
-        replicas = 0
+        nodeSelector              = local.argocd_node_selector
+        affinity                  = local.argocd_component_affinity.application_set
+        topologySpreadConstraints = local.argocd_component_topology_spread_constraints.application_set
+        resources = {
+          requests = {
+            cpu    = "100m"
+            memory = "256Mi"
+          }
+          limits = {
+            cpu    = "300m"
+            memory = "512Mi"
+          }
+        }
       }
       controller = {
         nodeSelector              = local.argocd_node_selector
@@ -1113,8 +1125,8 @@ resource "helm_release" "argocd" {
         topologySpreadConstraints = local.argocd_component_topology_spread_constraints.controller
         resources = {
           requests = {
-            cpu    = "75m"
-            memory = "192Mi"
+            cpu    = "100m"
+            memory = "256Mi"
           }
           limits = {
             cpu    = "300m"
@@ -1123,10 +1135,34 @@ resource "helm_release" "argocd" {
         }
       }
       dex = {
-        enabled = false
+        nodeSelector              = local.argocd_node_selector
+        affinity                  = local.argocd_component_affinity.dex
+        topologySpreadConstraints = local.argocd_component_topology_spread_constraints.dex
+        resources = {
+          requests = {
+            cpu    = "100m"
+            memory = "256Mi"
+          }
+          limits = {
+            cpu    = "300m"
+            memory = "512Mi"
+          }
+        }
       }
       notifications = {
-        enabled = false
+        nodeSelector              = local.argocd_node_selector
+        affinity                  = local.argocd_component_affinity.notifications
+        topologySpreadConstraints = local.argocd_component_topology_spread_constraints.notifications
+        resources = {
+          requests = {
+            cpu    = "100m"
+            memory = "256Mi"
+          }
+          limits = {
+            cpu    = "300m"
+            memory = "512Mi"
+          }
+        }
       }
       redis = {
         nodeSelector              = local.argocd_node_selector
@@ -1134,12 +1170,12 @@ resource "helm_release" "argocd" {
         topologySpreadConstraints = local.argocd_component_topology_spread_constraints.redis
         resources = {
           requests = {
-            cpu    = "25m"
-            memory = "64Mi"
+            cpu    = "100m"
+            memory = "256Mi"
           }
           limits = {
-            cpu    = "100m"
-            memory = "128Mi"
+            cpu    = "300m"
+            memory = "512Mi"
           }
         }
       }
@@ -1149,12 +1185,12 @@ resource "helm_release" "argocd" {
         topologySpreadConstraints = local.argocd_component_topology_spread_constraints.repo_server
         resources = {
           requests = {
-            cpu    = "50m"
-            memory = "128Mi"
+            cpu    = "100m"
+            memory = "256Mi"
           }
           limits = {
             cpu    = "300m"
-            memory = "384Mi"
+            memory = "512Mi"
           }
         }
       }
@@ -1164,12 +1200,12 @@ resource "helm_release" "argocd" {
         topologySpreadConstraints = local.argocd_component_topology_spread_constraints.server
         resources = {
           requests = {
-            cpu    = "50m"
-            memory = "128Mi"
+            cpu    = "100m"
+            memory = "256Mi"
           }
           limits = {
             cpu    = "300m"
-            memory = "384Mi"
+            memory = "512Mi"
           }
         }
       }
@@ -1185,7 +1221,7 @@ resource "null_resource" "argocd_ready" {
     namespace       = var.argocd.namespace
     version         = var.argocd.version
     node_selector   = jsonencode(local.argocd_node_selector)
-    readiness_check = "5"
+    readiness_check = "6"
   }
 
   provisioner "local-exec" {
@@ -1248,7 +1284,10 @@ wait_for_argocd_component() {
 }
 
 kubectl --kubeconfig "${self.triggers.kubeconfig_path}" wait --for=condition=Established --timeout=180s crd/applications.argoproj.io
+wait_for_argocd_component deployment/argocd-applicationset-controller app.kubernetes.io/name=argocd-applicationset-controller
 wait_for_argocd_component statefulset/argocd-application-controller app.kubernetes.io/name=argocd-application-controller
+wait_for_argocd_component deployment/argocd-dex-server app.kubernetes.io/name=argocd-dex-server
+wait_for_argocd_component deployment/argocd-notifications-controller app.kubernetes.io/name=argocd-notifications-controller
 wait_for_argocd_component deployment/argocd-redis app.kubernetes.io/name=argocd-redis
 wait_for_argocd_component deployment/argocd-repo-server app.kubernetes.io/name=argocd-repo-server
 wait_for_argocd_component deployment/argocd-server app.kubernetes.io/name=argocd-server