Add a wait flag to "prioritize" new orchestrator job definition

Author: jakubno

packages/nomad/orchestrator.hcl

@@ -5,11 +5,12 @@ job "orchestrator-${latest_orchestrator_job_id}" {
   priority = 90
 
   group "client-orchestrator" {
-    network {
-      port "orchestrator" {
-        static = "${port}"
-      }
-    }
+# TODO: Return after migrating to the new version
+#    network {
+#      port "orchestrator" {
+#        static = "${port}"
+#      }
+#    }
 
     service {
       name = "orchestrator"
@@ -83,7 +84,7 @@ EOT
 
       config {
         command = "/bin/bash"
-        args    = ["-c", " chmod +x local/orchestrator && local/orchestrator --port ${port} --proxy-port ${proxy_port}"]
+        args    = ["-c", " chmod +x local/orchestrator && local/orchestrator --port ${port} --proxy-port ${proxy_port} --wait 0"]
       }
 
       artifact {

packages/orchestrator/Makefile

@@ -47,7 +47,7 @@ run-debug:
 	ORCHESTRATOR_SERVICES=$(ORCHESTRATOR_SERVICES) \
 	GCP_DOCKER_REPOSITORY_NAME=$(GCP_DOCKER_REPOSITORY_NAME) \
 	GOOGLE_SERVICE_ACCOUNT_BASE64=$(GOOGLE_SERVICE_ACCOUNT_BASE64) \
-	./bin/orchestrator
+	./bin/orchestrator --wait 0
 
 .PHONY: upload/orchestrator
 upload/orchestrator:

packages/orchestrator/main.go

@@ -11,6 +11,7 @@ import (
 	"os/signal"
 	"slices"
 	"syscall"
+	"time"
 
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
@@ -41,6 +42,7 @@ type Closeable interface {
 const (
 	defaultPort      = 5008
 	defaultProxyPort = 5007
+	defaultWait      = 30
 )
 
 var forceStop = env.GetEnv("FORCE_STOP", "false") == "true"
@@ -49,6 +51,7 @@ var commitSHA string
 func main() {
 	port := flag.Uint("port", defaultPort, "orchestrator server port")
 	proxyPort := flag.Uint("proxy-port", defaultProxyPort, "orchestrator proxy port")
+	wait := flag.Uint("wait", defaultWait, "orchestrator proxy port")
 	flag.Parse()
 
 	if *port > math.MaxUint16 {
@@ -61,6 +64,12 @@ func main() {
 		os.Exit(1)
 	}
 
+	// TODO: Remove after the orchestrator is fully migrated to the new job definition
+	if *wait > 0 {
+		log.Printf("waiting %d seconds before starting orchestrator", *wait)
+		time.Sleep(time.Duration(*wait) * time.Second)
+	}
+
 	result := run(*port, *proxyPort)
 
 	if result == false {