Refactor ArgoCD setup to remove null_resource and implement wait_for in kubernetes_manifest

Author: karimzakzouk

Terraform/0-versions.tf

@@ -1,21 +0,0 @@
-terraform {
-  required_version = ">= 1.4.0"
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.0"
-    }
-    helm = {
-      source  = "hashicorp/helm"
-      version = "~> 2.12"
-    }
-    kubernetes = {
-      source  = "hashicorp/kubernetes"
-      version = "~> 2.25"
-    }
-    time = {
-      source  = "hashicorp/time"
-      version = "~> 0.9"
-    }
-  }
-}

Terraform/3-main.tf

@@ -26,7 +26,7 @@ resource "helm_release" "argocd" {
   namespace  = "argocd"
 
   create_namespace = true
-  wait             = true
+  wait             = true   # Wait for ArgoCD pods to be ready
   timeout          = 600
 
   set {
@@ -42,17 +42,10 @@ resource "helm_release" "argocd" {
   depends_on = [module.eks]
 }
 
-# Wait for ArgoCD to be ready before creating applications
-resource "null_resource" "wait_for_argocd" {
-  provisioner "local-exec" {
-    command = "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=argocd-server -n argocd --timeout=300s"
-  }
-  
-  depends_on = [helm_release.argocd]
-}
-
 # Create ArgoCD Application automatically
 resource "kubernetes_manifest" "solar_system_app" {
+  provider = kubernetes-alpha
+
   manifest = {
     apiVersion = "argoproj.io/v1alpha1"
     kind       = "Application"
@@ -80,5 +73,13 @@ resource "kubernetes_manifest" "solar_system_app" {
     }
   }
 
-  depends_on = [null_resource.wait_for_argocd]
-}
+  wait_for {
+    fields = {
+      "status.health.status" = "Healthy"
+      "status.sync.status"   = "Synced"
+    }
+  }
+
+  depends_on = [helm_release.argocd]
+}
+