Merge branch 'main' of https://github.com/S25-SNA-Project/HTTP-Load-Balancer

Author: wkwtfigo

.github/workflows/ci-cd.yaml

@@ -101,35 +101,9 @@ jobs:
               run: |
                 echo "=== Deploying load balancer ==="
                 nomad job run _nomad/loadbalancer.nomad
-                
-                echo "=== Waiting for deployment to stabilize ==="
-                sleep 15
-                
-                echo "=== Verifying deployment ==="
-                ALLOC_ID=$(nomad job allocs -json loadbalancer | jq -r '.[0].ID')
-                STATUS=$(nomad alloc status $ALLOC_ID | grep -A 3 "Task Status" | grep "loadbalancer" | awk '{print $2}')
-                
-                if [ "$STATUS" != "running" ]; then
-                  echo "::error::Container failed to stay running"
-                  nomad alloc logs $ALLOC_ID loadbalancer
-                  exit 1
-                fi
-                
-                echo "=== Verifying health check ==="
-                PORT=$(nomad alloc status $ALLOC_ID | grep "http" | awk '{print $3}')
-                if ! curl -sf http://localhost:$PORT/health; then
-                  echo "::error::Health check failed"
-                  nomad alloc logs $ALLOC_ID loadbalancer
-                  exit 1
-                fi
-                
-                echo "=== Verifying port accessibility ==="
-                NODE_ADDR=$(nomad node status -json $(nomad alloc status -json $ALLOC_ID | jq -r '.NodeID') | jq -r '.Attributes."unique.network.ip-address"')
-                if ! nc -zv $NODE_ADDR $PORT; then
-                  echo "::error::Port $PORT not accessible on $NODE_ADDR"
-                  exit 1
-                fi
-
+              env:
+                NOMAD_ADDR: ${{ secrets.NOMAD_ADDR }}
+                NOMAD_TOKEN: ${{ secrets.NOMAD_TOKEN }}
 
             - name: Deploy jobs to Nomad
               run: |

_nomad/loadbalancer.nomad

@@ -34,9 +34,9 @@ job "loadbalancer" {
 
       config {
         image = "wkwtfigo/load-balancer:latest"
-        ports = ["http"]
+        ports = ["http", "communication"]
         volumes = [
-          "/var/log/app-redirect-balancer:/app/.logs"
+          "/var/log/app-redirect-balancer/:/app/.logs/"
         ]
       }
 
@@ -55,6 +55,10 @@ job "loadbalancer" {
         static = 8000
         to     = 8000
       }
+      port "communication" {
+        static = 8001
+        to     = 8001
+      }
     }
   }
 }

balanced_instance/config.json

@@ -2,5 +2,5 @@
     "balancing_address": "151.242.43.104:8000",
     "balanced_port": 8080,
     "application_port": 8888,
-    "log_file": "./.logs/balanced.log"
+    "log_file": "/app/.logs/balanced.log"
 }

balancer_server/config.json

@@ -3,5 +3,5 @@
     "balancing_port": 8000,
     "exposed_port": 8001,
     "type": "redirect",
-    "log_file": "./.logs/balancer.log"
+    "log_file": "/app/.logs/balancer.log"
 }