Refactor ArgoCD installation steps: streamline Helm setup, remove unnecessary wait for LoadBalancer, and enhance URL retrieval logic

Author: karimzakzouk

.github/workflows/terraform.yml

@@ -52,38 +52,48 @@ jobs:
         run: terraform apply -auto-approve
         working-directory: ./Terraform
 
+      # ---------------------------
+      # Install ArgoCD with Helm
+      # ---------------------------
       - name: Update kubeconfig
         if: ${{ inputs.terraform-action == 'apply' || inputs.terraform-action == '' }}
         run: |
           aws eks update-kubeconfig --name otel-cluster --region us-east-1
 
-      - name: Wait for ArgoCD LoadBalancer
+      - name: Install Helm
+        if: ${{ inputs.terraform-action == 'apply' || inputs.terraform-action == '' }}
+        uses: azure/[email protected]
+        with:
+          version: v3.14.0
+
+      - name: Add ArgoCD Helm Repo
         if: ${{ inputs.terraform-action == 'apply' || inputs.terraform-action == '' }}
         run: |
-          echo "Waiting for ArgoCD LoadBalancer to be ready..."
-          kubectl wait --for=condition=available --timeout=300s deployment/argocd-server -n argocd || true
-          sleep 30
+          helm repo add argo https://argoproj.github.io/argo-helm
+          helm repo update
 
-      - name: Get ArgoCD Access Info
+      - name: Install/Upgrade ArgoCD
         if: ${{ inputs.terraform-action == 'apply' || inputs.terraform-action == '' }}
         run: |
-          echo "=========================================="
-          echo "🚀 ARGOCD ACCESS INFORMATION"
-          echo "=========================================="
-          
-          # Get ArgoCD URL
-          ARGOCD_URL=$(kubectl get svc argocd-server -n argocd -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo "Still loading...")
-          echo "📋 ArgoCD URL: http://$ARGOCD_URL"
+          helm upgrade --install argocd argo/argo-cd \
+            --namespace argocd \
+            --create-namespace \
+            --version 6.7.2 \
+            --wait
+            
+
+      # ---------------------------
+      # Get ArgoCD Server URL
+      # ---------------------------
+      - name: Get ArgoCD URL
+        if: ${{ inputs.terraform-action == 'apply' || inputs.terraform-action == '' }}
+        run: |
+          echo "Waiting for ArgoCD LoadBalancer..."
+          kubectl wait --for=condition=available deployment/argocd-server -n argocd --timeout=300s || true
           
-          # Get admin password
-          ARGOCD_PASSWORD=$(kubectl -n argocd get secret argocd-initial-admin-secret -o jsonpath='{.data.password}' 2>/dev/null | base64 -d || echo "Secret not ready yet")
-          echo "🔑 Username: admin"
-          echo "🔑 Password: $ARGOCD_PASSWORD"
+          ARGOCD_URL=$(kubectl get svc argocd-server -n argocd -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
+          if [ -z "$ARGOCD_URL" ]; then
+            ARGOCD_URL=$(kubectl get svc argocd-server -n argocd -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+          fi
           
-          echo "=========================================="
-          echo "📝 Instructions:"
-          echo "1. Wait a few minutes for LoadBalancer DNS to propagate"
-          echo "2. Access: http://$ARGOCD_URL"
-          echo "3. Login with username 'admin' and password above"
-          echo "4. Your solar-system app should appear automatically"
-          echo "=========================================="
+          echo "ArgoCD URL: http://$ARGOCD_URL"