Enhance workflow inputs across multiple YAML files for ArgoCD, Deploy, Endpoints, Monitoring, and Terraform, ensuring required parameters are clearly defined and utilized in deployment steps.

karimzakzouk · karimzakzouk · commit 0753dae78653 · 2025-08-24T23:42:08.000+03:00
diff --git a/.github/workflows/argocd.yml b/.github/workflows/argocd.yml
@@ -3,12 +3,31 @@ on:
   workflow_dispatch:
   workflow_call:
     inputs:
-      image-tag:
+      cluster_name:
+        description: 'EKS Cluster Name'
+        required: true
+        type: string
+      app_namespace:
+        description: 'Kubernetes Namespace for the Application'
+        required: true
+        type: string
+      monitoring_namespace:
+        description: 'Kubernetes Namespace for Monitoring'
+        required: true
+        type: string
+      argocd_namespace:
+        description: 'Kubernetes Namespace for ArgoCD'
+        required: true
+        type: string
+      app_name:
+        description: 'Name of the Application'
+        required: true
+        type: string
+      image_tag:
         description: 'Docker image tag to deploy'
         required: false
         default: ''
         type: string
-
 jobs:
   argocd:
     name: ArgoCD & Monitoring Deployment
@@ -19,7 +38,7 @@ jobs:
 
       - name: Wait for GitHub variables to propagate
         run: sleep 30
-        
+
       - name: Checkout Repository
         uses: actions/checkout@v5
 
@@ -31,7 +50,7 @@ jobs:
           aws-region: us-east-1
 
       - name: Update kubeconfig
-        run: aws eks update-kubeconfig --name ${{ vars.CLUSTER_NAME }} --region us-east-1
+        run: aws eks update-kubeconfig --name ${{ inputs.cluster_name }} --region us-east-1
 
       - name: Install Helm
         uses: azure/setup-helm@v4.2.0
@@ -46,27 +65,27 @@ jobs:
       - name: Install/Upgrade ArgoCD
         run: |
           helm upgrade --install argocd argo/argo-cd \
-            --namespace ${{ vars.ARGOCD_NAMESPACE }} \
+            --namespace ${{ inputs.argocd_namespace }} \
             --create-namespace \
             --set server.service.type=LoadBalancer \
             --wait
 
       - name: Create Application Namespace
         run: |
-          kubectl create namespace ${{ vars.APP_NAMESPACE }} --dry-run=client -o yaml | kubectl apply -f -
-          
+          kubectl create namespace ${{ inputs.app_namespace }} --dry-run=client -o yaml | kubectl apply -f -
+
       - name: Deploy Helm Chart
         run: |
-          helm upgrade --install ${{ vars.APP_NAME }} ./helm \
-            --namespace ${{ vars.APP_NAMESPACE }} \
+          helm upgrade --install ${{ inputs.app_name }} ./helm \
+            --namespace ${{ inputs.app_namespace }} \
             --set mongo.uri="${{ secrets.MONGO_URI }}" \
             --set mongo.username="${{ secrets.MONGO_USERNAME }}" \
             --set mongo.password="${{ secrets.MONGO_PASSWORD }}" \
-            --set image.tag="${{ inputs.image-tag || github.sha }}"
+            --set image.tag="${{ inputs.image_tag || github.sha }}"
             
       - name: Deploy ArgoCD Applications
         run: |
-          export APP_NAME=${{ vars.APP_NAME }}
-          export APP_NAMESPACE=${{ vars.APP_NAMESPACE }}
-          export ARGOCD_NAMESPACE=${{ vars.ARGOCD_NAMESPACE }}
+          export APP_NAME=${{ inputs.app_name }}
+          export APP_NAMESPACE=${{ inputs.app_namespace }}
+          export ARGOCD_NAMESPACE=${{ inputs.argocd_namespace }}
           envsubst < ./argocd/application.yml | kubectl apply -f -
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,6 +2,32 @@ name: Kubernetes Deployment
 on:
   workflow_dispatch:
   workflow_call:
+    inputs:
+      cluster_name:
+        description: 'EKS Cluster Name'
+        required: true
+        type: string
+      app_namespace:
+        description: 'Kubernetes Namespace for the Application'
+        required: true
+        type: string
+      monitoring_namespace:
+        description: 'Kubernetes Namespace for Monitoring'
+        required: true
+        type: string
+      argocd_namespace:
+        description: 'Kubernetes Namespace for ArgoCD'
+        required: true
+        type: string
+      app_name:
+        description: 'Name of the Application'
+        required: true
+        type: string
+      image_tag:
+        description: 'Docker image tag to deploy'
+        required: false
+        default: ''
+        type: string
 jobs:
   deploy:
     name: Deploy to Kubernetes
@@ -21,25 +47,25 @@ jobs:
           
       - name: Update kubeconfig
         run: |
-          aws eks update-kubeconfig --name ${{ vars.CLUSTER_NAME }} --region us-east-1
-          
+          aws eks update-kubeconfig --name ${{ inputs.cluster_name }} --region us-east-1
+
       - name: Create Application Namespace
         run: |
-          kubectl create namespace ${{ vars.APP_NAMESPACE }} --dry-run=client -o yaml | kubectl apply -f -
-          
+          kubectl create namespace ${{ inputs.app_namespace }} --dry-run=client -o yaml | kubectl apply -f -
+
       - name: Deploy Helm Chart
         run: |
-          helm upgrade --install ${{ vars.APP_NAME }} ./helm \
-            --namespace ${{ vars.APP_NAMESPACE }} \
+          helm upgrade --install ${{ inputs.app_name }} ./helm \
+            --namespace ${{ inputs.app_namespace }} \
             --set mongo.uri="${{ secrets.MONGO_URI }}" \
             --set mongo.username="${{ secrets.MONGO_USERNAME }}" \
             --set mongo.password="${{ secrets.MONGO_PASSWORD }}" \
-            --set image.tag="${{ inputs.image-tag || github.sha }}"
-            
+            --set image.tag="${{ inputs.image_tag || github.sha }}"
+
       - name: Deploy ArgoCD Applications
         run: |
-          export APP_NAME=${{ vars.APP_NAME }}
-          export APP_NAMESPACE=${{ vars.APP_NAMESPACE }}
-          export ARGOCD_NAMESPACE=${{ vars.ARGOCD_NAMESPACE }}
+          export APP_NAME=${{ inputs.app_name }}
+          export APP_NAMESPACE=${{ inputs.app_namespace }}
+          export ARGOCD_NAMESPACE=${{ inputs.argocd_namespace }}
           envsubst < ./argocd/application.yml | kubectl apply -f -
             
diff --git a/.github/workflows/endpoints.yml b/.github/workflows/endpoints.yml
@@ -2,6 +2,32 @@ name: Print Service Endpoints
 on:
   workflow_dispatch:
   workflow_call:
+    inputs:
+      cluster_name:
+        description: 'EKS Cluster Name'
+        required: true
+        type: string
+      app_namespace:
+        description: 'Kubernetes Namespace for the Application'
+        required: true
+        type: string
+      monitoring_namespace:
+        description: 'Kubernetes Namespace for Monitoring'
+        required: true
+        type: string
+      argocd_namespace:
+        description: 'Kubernetes Namespace for ArgoCD'
+        required: true
+        type: string
+      app_name:
+        description: 'Name of the Application'
+        required: true
+        type: string
+      image_tag:
+        description: 'Docker image tag to deploy'
+        required: false
+        default: ''
+        type: string
 
 jobs:
   print-endpoints:
@@ -18,21 +44,21 @@ jobs:
           
       - name: Update kubeconfig
         run: |
-          aws eks update-kubeconfig --name ${{ vars.CLUSTER_NAME }} --region us-east-1
-          
+          aws eks update-kubeconfig --name ${{ inputs.cluster_name }} --region us-east-1
+
       - name: Print Service Endpoints
         run: |
           echo "================= SERVICE ENDPOINTS ================="
-          ARGOCD_HOST=$(kubectl get svc argocd-server -n ${{ vars.ARGOCD_NAMESPACE }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo 'Not found')
-          PROM_HOST=$(kubectl get svc kube-prometheus-stack-prometheus -n ${{ vars.MONITORING_NAMESPACE }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo 'Not found')
-          GRAFANA_HOST=$(kubectl get svc kube-prometheus-stack-grafana -n ${{ vars.MONITORING_NAMESPACE }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo 'Not found')
-          APP_HOST=$(kubectl get svc ${{ vars.APP_NAME }}-svc -n ${{ vars.APP_NAMESPACE }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo 'Not found')
+          ARGOCD_HOST=$(kubectl get svc argocd-server -n ${{ inputs.argocd_namespace }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo 'Not found')
+          PROM_HOST=$(kubectl get svc kube-prometheus-stack-prometheus -n ${{ inputs.monitoring_namespace }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo 'Not found')
+          GRAFANA_HOST=$(kubectl get svc kube-prometheus-stack-grafana -n ${{ inputs.monitoring_namespace }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo 'Not found')
+          APP_HOST=$(kubectl get svc ${{ inputs.app_name }}-svc -n ${{ inputs.app_namespace }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null || echo 'Not found')
           echo "ArgoCD: http://$ARGOCD_HOST"
           echo "Prometheus: http://$PROM_HOST:9090"
           echo "Grafana: http://$GRAFANA_HOST"
           echo "App: http://$APP_HOST"
           echo "================= DEFAULT CREDENTIALS ================="
-          ARGOCD_PASS=$(kubectl -n ${{ vars.ARGOCD_NAMESPACE }} get secret argocd-initial-admin-secret -o jsonpath='{.data.password}' 2>/dev/null | base64 -d || echo 'Not found')
+          ARGOCD_PASS=$(kubectl -n ${{ inputs.argocd_namespace }} get secret argocd-initial-admin-secret -o jsonpath='{.data.password}' 2>/dev/null | base64 -d || echo 'Not found')
           echo "ArgoCD -> Username: admin"
           echo "ArgoCD -> Password: $ARGOCD_PASS"
           echo "Grafana -> Username: admin"
diff --git a/.github/workflows/main-pipeline.yml b/.github/workflows/main-pipeline.yml
@@ -130,7 +130,6 @@ jobs:
     uses: ./.github/workflows/docker.yml
     secrets: inherit
 
-  # Terraform - runs after docker (for linear flow) when infra changes or manual dispatch
   terraform:
     name: Deploy Infrastructure
     needs: [docker, detect-changes]
@@ -167,53 +166,74 @@ jobs:
       )
     uses: ./.github/workflows/argocd.yml
     secrets: inherit
+    with:
+      cluster_name: ${{ needs.terraform.outputs.cluster_name }}
+      app_namespace: ${{ needs.terraform.outputs.app_namespace }}
+      monitoring_namespace: ${{ needs.terraform.outputs.monitoring_namespace }}
+      argocd_namespace: ${{ needs.terraform.outputs.argocd_namespace }}
+      app_name: ${{ needs.terraform.outputs.app_name }}
+      image_tag: ${{ github.sha }}
     permissions:
       contents: write
       packages: write
       id-token: write
       actions: read
 
-  # Application Deployment - runs after ArgoCD when infra changes or manual dispatch
-  deployment:
-    name: Deploy Application
+  # Monitoring - runs first after ArgoCD
+  monitoring:
+    name: Deploy Monitoring Stack
     needs: [argocd, detect-changes]
     if: |
       !cancelled() &&
-      !inputs.skip-deployment && 
+      !inputs.skip-monitoring && 
       (needs.argocd.result == 'success' || (needs.argocd.result == 'skipped' && inputs.skip-argocd)) && (
         inputs.force-all || 
         (github.event_name == 'workflow_dispatch') ||
         needs.detect-changes.outputs.infra-changed == 'true'
       )
-    uses: ./.github/workflows/deploy.yml
+    uses: ./.github/workflows/monitoring.yml
     secrets: inherit
+    with:
+      cluster_name: ${{ needs.terraform.outputs.cluster_name }}
+      app_namespace: ${{ needs.terraform.outputs.app_namespace }}
+      monitoring_namespace: ${{ needs.terraform.outputs.monitoring_namespace }}
+      argocd_namespace: ${{ needs.terraform.outputs.argocd_namespace }}
+      app_name: ${{ needs.terraform.outputs.app_name }}
+      image_tag: ${{ github.sha }}
     permissions:
       contents: write
       packages: write
       id-token: write
       actions: read
 
-  # Monitoring - runs in parallel with deployment after ArgoCD
-  monitoring:
-    name: Deploy Monitoring Stack
-    needs: [argocd, detect-changes]
+  # Application Deployment - runs after monitoring completes
+  deployment:
+    name: Deploy Application
+    needs: [monitoring, detect-changes]
     if: |
       !cancelled() &&
-      !inputs.skip-monitoring && 
-      (needs.argocd.result == 'success' || (needs.argocd.result == 'skipped' && inputs.skip-argocd)) && (
+      !inputs.skip-deployment && 
+      (needs.monitoring.result == 'success' || (needs.monitoring.result == 'skipped' && inputs.skip-monitoring)) && (
         inputs.force-all || 
         (github.event_name == 'workflow_dispatch') ||
         needs.detect-changes.outputs.infra-changed == 'true'
       )
-    uses: ./.github/workflows/monitoring.yml
+    uses: ./.github/workflows/deploy.yml
     secrets: inherit
+    with:
+      cluster_name: ${{ needs.terraform.outputs.cluster_name }}
+      app_namespace: ${{ needs.terraform.outputs.app_namespace }}
+      monitoring_namespace: ${{ needs.terraform.outputs.monitoring_namespace }}
+      argocd_namespace: ${{ needs.terraform.outputs.argocd_namespace }}
+      app_name: ${{ needs.terraform.outputs.app_name }}
+      image_tag: ${{ github.sha }}
     permissions:
       contents: write
       packages: write
       id-token: write
       actions: read
 
-  # Show endpoints - runs after both deployment and monitoring complete
+  # Show endpoints - runs after deployment completes
   show-endpoints:
     name: Show Service Endpoints
     needs: [detect-changes, deployment, monitoring]
@@ -227,6 +247,13 @@ jobs:
       )
     uses: ./.github/workflows/endpoints.yml
     secrets: inherit
+    with:
+      cluster_name: ${{ needs.terraform.outputs.cluster_name }}
+      app_namespace: ${{ needs.terraform.outputs.app_namespace }}
+      monitoring_namespace: ${{ needs.terraform.outputs.monitoring_namespace }}
+      argocd_namespace: ${{ needs.terraform.outputs.argocd_namespace }}
+      app_name: ${{ needs.terraform.outputs.app_name }}
+      image_tag: ${{ github.sha }}
     permissions:
       contents: read
       id-token: write
diff --git a/.github/workflows/monitoring.yml b/.github/workflows/monitoring.yml
@@ -2,6 +2,32 @@ name: Monitoring Deployment
 on:
   workflow_dispatch:
   workflow_call:
+    inputs:
+      cluster_name:
+        description: 'EKS Cluster Name'
+        required: true
+        type: string
+      app_namespace:
+        description: 'Kubernetes Namespace for the Application'
+        required: true
+        type: string
+      monitoring_namespace:
+        description: 'Kubernetes Namespace for Monitoring'
+        required: true
+        type: string
+      argocd_namespace:
+        description: 'Kubernetes Namespace for ArgoCD'
+        required: true
+        type: string
+      app_name:
+        description: 'Name of the Application'
+        required: true
+        type: string
+      image_tag:
+        description: 'Docker image tag to deploy'
+        required: false
+        default: ''
+        type: string
 
 jobs:
   monitoring:
@@ -21,19 +47,19 @@ jobs:
           aws-region: us-east-1
 
       - name: Update kubeconfig
-        run: aws eks update-kubeconfig --name ${{ vars.CLUSTER_NAME }} --region us-east-1
+        run: aws eks update-kubeconfig --name ${{ inputs.cluster_name }} --region us-east-1
 
       - name: Create Grafana Secret
         run: |
-          kubectl create namespace ${{ vars.MONITORING_NAMESPACE }} --dry-run=client -o yaml | kubectl apply -f -
+          kubectl create namespace ${{ inputs.monitoring_namespace }} --dry-run=client -o yaml | kubectl apply -f -
           kubectl create secret generic grafana-admin-secret \
             --from-literal=admin-user=admin \
             --from-literal=admin-password='${{ secrets.GRAFANA_ADMIN_PASSWORD }}' \
-            --namespace ${{ vars.MONITORING_NAMESPACE }} \
+            --namespace ${{ inputs.monitoring_namespace }} \
             --dry-run=client -o yaml | kubectl apply -f -
 
       - name: Deploy Monitoring
         run: |
-          export MONITORING_NAMESPACE=${{ vars.MONITORING_NAMESPACE }}
-          export ARGOCD_NAMESPACE=${{ vars.ARGOCD_NAMESPACE }}
+          export MONITORING_NAMESPACE=${{ inputs.monitoring_namespace }}
+          export ARGOCD_NAMESPACE=${{ inputs.argocd_namespace }}
           envsubst < ./argocd/monitoring.yml | kubectl apply -f -
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
