From e3e19f50995859deb7ca204b1ea7f76c31b75278 Mon Sep 17 00:00:00 2001
From: Nicolas Koehl <nic@mstexvn.com>
Date: Wed, 26 Feb 2025 17:25:35 +0700
Subject: [PATCH] Refactor Nomad job configuration for nomad-mcp service

---
 app/__pycache__/main.cpython-313.pyc | Bin 5741 -> 8336 bytes
 nomad_mcp_job.nomad                  |  69 +++++++++++++--------------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/app/__pycache__/main.cpython-313.pyc b/app/__pycache__/main.cpython-313.pyc
index 50700bd8de9d052c4b881326a1e3ea3436ded252..e8d09eb7fb5343951a5a894010edc3ea7bfccd3d 100644
GIT binary patch
delta 3326
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
XfB6fWmr|Xj%+GsdpO$lqo7nn4@#GF+

delta 906
zcmZvbT}azd6vuDU)Kp{B@2Z`4m${(@ZP|x(6BR@mt##e7R_0`6(bk&LCX%F;$v}PD
zIvAB*#uNs!x4jG;gFOy>+rwZL1<OUYmpu*kAo@Dkjddz+=i!k1yXXAR`6pz#|5pdU
zZ?)C|5?_9P%6xUc=S8birvZ2gCJcHQBQ%004@IF3tJ^O2fzwwET5`E47IpHM%sz5s
zLBDOy?Fl*wcyN{OqN)lIB*8_HFeR9T`IPQqGxAwn_5Z-2!_6Iy2VkUH_&?^extIwj
z0BFJCMb90zt)?!ry%8ZsrjnEkL<Rtm>9YeuY_;liP9E>ueuPs*>sH{eEtsfD(r0YZ
z8V!jx4nV{EhP~OIU{73UEP+~N^9<T?U1GF<G&&#*Mn~qaBsFxW(QSs)s**#?9uM6O
z(K~O*f9|G|ms3#FMO~VLDM?LF>5BRYih4JkzlJ6nnihgE8HICFHVb7%hm&b27DOp4
zPG-}=c!0ySqT!lMT2IRb%*=}V3^q#|5mIjuN0^c1X$3P66-mY{p|Y4uV^*Bh4l6B!
zFfC=%f`HjMQI#b*6EI=Ex{N@o1tRLh{H&sB5}79$O_~}b!kURBG}r`hC&|MDgH%Xb
z1P3+1+xTky#rVqOEl<Z{{2S|eePOL_wQa3)weu~%;|p*4!n+o}#1*-+H}ctEj@&J~
z$G0u_Dz=ugr3Jn54QKZ4z;XU5v&&ga;bOSdTkKtN?{NMt&c9plEX9hkvaf4BwLVsE
z?AfmGt+*PV#r9aza=-&K_awd)FT0}K%ut21?USVdra}Q4*B-xJ%*^PytQtY<&EKgg
zT5kDq-*AEJPMl+Nj(iwh9WgkYFGy30Dr1vG&=5hYU~rR~m(`$g95d2ogIRiVN-CdC
d_o)SPG=2u{<A+WEFlBC{?0eTyE0h?c`VRmZ=g$BD

diff --git a/nomad_mcp_job.nomad b/nomad_mcp_job.nomad
index 522ba4e..6d85bbb 100644
--- a/nomad_mcp_job.nomad
+++ b/nomad_mcp_job.nomad
@@ -1,5 +1,5 @@
 job "nomad-mcp" {
-  datacenters = ["dc1"]
+  datacenters = ["jm"]
   type        = "service"
   namespace   = "development"
 
@@ -16,52 +16,43 @@ job "nomad-mcp" {
       driver = "docker"
 
       config {
-        image = "python:3.11-slim"
+        image = "registry.dev.meisheng.group/nomad_mcp:20250226"
         ports = ["http"]
         command = "python"
         args = ["-m", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
-        
-        mount {
-          type = "bind"
-          source = "local/nomad_mcp"
-          target = "/app"
-          readonly = false
+      }
+
+      # Pull code from Gitea
+      artifact {
+        source      = "git::ssh://git@gitea.service.mesh:2222/Mei_Sheng_Textiles/nomad_mcp.git"
+        destination = "local/nomad_mcp"
+        options {
+          ref    = "main"  # or whichever branch/tag you want to use
+          sshkey = "LS0tLS1CRUdJTiBPUEVOU1NIIFBSSVZBVEUgS0VZLS0tLS0KYjNCbGJuTnphQzFyWlhrdGRqRUFBQUFBQkc1dmJtVUFBQUFFYm05dVpRQUFBQUFBQUFBQkFBQUFNd0FBQUF0emMyZ3RaVwpReU5UVXhPUUFBQUNBY01oYkNPVXhFOHBYQ3d5UEh0ZFR4aThHU0pzNEdTNXZ6ZTR6Tm1ueUYvUUFBQUtCQm5RZi9RWjBICi93QUFBQXR6YzJndFpXUXlOVFV4T1FBQUFDQWNNaGJDT1V4RThwWEN3eVBIdGRUeGk4R1NKczRHUzV2emU0ek5tbnlGL1EKQUFBRURreWwzQlZlek9YUWZUNzZac0NkYTZPNTFnMExsb25EMEd6L2Y4SHh3dzRCd3lGc0k1VEVUeWxjTERJOGUxMVBHTAp3WkltemdaTG0vTjdqTTJhZklYOUFBQUFHR1JsY0d4dmVTQnJaWGtnWm05eUlHNXZiV0ZrWDIxamNBRUNBd1FGCi0tLS0tRU5EIE9QRU5TU0ggUFJJVkFURSBLRVktLS0tLQo="
         }
       }
 
-      artifact {
-        source      = "git::https://gitea.dev.meisheng.group/nkohl/nomad_mcp.git"
-        destination = "local/nomad_mcp"
-      }
-
       env {
+        # Nomad connection settings
         NOMAD_ADDR = "http://pjmldk01.ds.meisheng.group:4646"
         NOMAD_NAMESPACE = "development"
-        LOG_LEVEL = "DEBUG"
-        PYTHONPATH = "/app"
+        NOMAD_SKIP_VERIFY = "true"
+        
+        # API settings
+        PORT = "8000"
+        HOST = "0.0.0.0"
+        
+        # Logging level
+        LOG_LEVEL = "INFO"
+        
+        # Enable to make development easier
+        RELOAD = "true"
+        
+        # Set PYTHONPATH to include the app directory
+        PYTHONPATH = "/local/nomad_mcp"
         STATIC_DIR = "/local/nomad_mcp/static"
       }
 
-      # Add a template to create the static directory if it doesn't exist
-      template {
-        data = <<EOH
-#!/bin/bash
-echo "Ensuring static directory exists at ${STATIC_DIR}"
-mkdir -p ${STATIC_DIR}
-chmod -R 755 ${STATIC_DIR}
-echo "Static directory setup complete"
-EOH
-        destination = "local/setup_static.sh"
-        perms = "755"
-      }
-
-      # Run the setup script before starting the application
-      lifecycle {
-        hook = "prestart"
-        command = "/bin/bash"
-        args = ["local/setup_static.sh"]
-      }
-
       resources {
         cpu    = 200
         memory = 256
@@ -73,7 +64,8 @@ EOH
         tags = [
           "traefik.enable=true",
           "traefik.http.routers.nomad-mcp.entryPoints=https",
-          "traefik.http.routers.nomad-mcp.rule=Host(`nomad_mcp.dev.meisheng.group`)"
+          "traefik.http.routers.nomad-mcp.rule=Host(`nomad_mcp.dev.meisheng.group`)",
+          "traefik.http.routers.nomad-mcp.middlewares=proxyheaders@consulcatalog"
         ]
 
         check {
@@ -81,6 +73,11 @@ EOH
           path     = "/api/health"
           interval = "10s"
           timeout  = "2s"
+
+          check_restart {
+            limit = 3
+            grace = "60s"
+          }
         }
       }
     }