Skip to content

Commit 79bd503

Browse files
committed
revert unnecessary changes
1 parent 98e0fa4 commit 79bd503

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

iac/provider-gcp/nomad/jobs/orchestrator.hcl

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,29 @@ job "orchestrator-${latest_orchestrator_job_id}" {
99
name = "orchestrator"
1010
port = "${port}"
1111

12+
provider = "nomad"
13+
1214
check {
13-
type = "grpc"
15+
type = "http"
16+
path = "/health"
1417
name = "health"
1518
interval = "20s"
1619
timeout = "5s"
17-
grpc_use_tls = false
18-
port = "${port}"
1920
}
2021
}
2122

2223
service {
2324
name = "orchestrator-proxy"
2425
port = "${proxy_port}"
26+
27+
provider = "nomad"
28+
29+
check {
30+
type = "tcp"
31+
name = "health"
32+
interval = "30s"
33+
timeout = "1s"
34+
}
2535
}
2636

2737
task "check-placement" {

iac/provider-gcp/nomad/jobs/template-manager.hcl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@ job "template-manager-system" {
2323
}
2424

2525
network {
26-
port "template-manager" {
26+
port "api" {
2727
static = "${port}"
2828
}
2929
}
3030

3131
service {
32-
name = "template-manager"
33-
port = "${port}"
32+
name = "template-manager"
33+
port = "api"
34+
provider = "nomad"
3435

3536
check {
36-
type = "grpc"
37+
type = "http"
38+
path = "/health"
3739
name = "health"
3840
interval = "20s"
3941
timeout = "5s"
40-
grpc_use_tls = false
41-
port = "${port}"
4242
}
4343
}
4444

@@ -77,7 +77,7 @@ job "template-manager-system" {
7777
SHARED_CHUNK_CACHE_PATH = "${shared_chunk_cache_path}"
7878
CLICKHOUSE_CONNECTION_STRING = "${clickhouse_connection_string}"
7979
DOCKERHUB_REMOTE_REPOSITORY_URL = "${dockerhub_remote_repository_url}"
80-
GRPC_PORT = "${port}"
80+
GRPC_PORT = "$${NOMAD_PORT_api}"
8181
GIN_MODE = "release"
8282
%{ if !update_stanza }
8383
FORCE_STOP = "true"

0 commit comments

Comments
 (0)