Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary cleanup method and fix cleanup order #140 #141

Merged
merged 1 commit into from
Apr 17, 2024
Merged

Remove unnecessary cleanup method and fix cleanup order #140 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/nomad/api.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ job "orchestration-api" {
driver = "docker"

resources {
memory_max = 4096
memory = 2048
memory_max = 2048
cpu = 1024
}

Expand Down
5 changes: 3 additions & 2 deletions packages/nomad/client-proxy.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ job "client-proxy" {
driver = "docker"

resources {
memory = 1024
cpu = 128
max_memory = 2048
memory = 512
cpu = 512
}

config {
Expand Down
8 changes: 4 additions & 4 deletions packages/nomad/docker-reverse-proxy.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ variable "google_service_account_secret" {
job "docker-reverse-proxy" {
datacenters = [var.gcp_zone]

priority = 90
priority = 85

group "reverse-proxy" {
network {
Expand All @@ -83,9 +83,9 @@ job "docker-reverse-proxy" {
driver = "docker"

resources {
memory = 1024
memory_max = 1024
cpu = 512
max_memory = 2048
memory = 512
cpu = 1024
}

env {
Expand Down
7 changes: 3 additions & 4 deletions packages/nomad/logs-collector.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ job "logs-collector" {
priority = 85

group "collector" {
count = 1

network {
port "health" {
to = var.logs_health_port_number
Expand Down Expand Up @@ -90,8 +88,9 @@ job "logs-collector" {
}

resources {
memory = 256
cpu = 256
max_memory = 2048
memory = 512
cpu = 512
}

template {
Expand Down
6 changes: 2 additions & 4 deletions packages/nomad/loki.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ job "loki" {
priority = 75

group "loki-service" {
count = 1

network {
port "loki" {
to = var.loki_service_port_number
Expand Down Expand Up @@ -56,9 +54,9 @@ job "loki" {
}

resources {
cpu = 500
max_memory = 2048
memory = 1024
memory_max = 2048
cpu = 512
}

template {
Expand Down
2 changes: 1 addition & 1 deletion packages/nomad/orchestrator.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ job "orchestrator" {
type = "system"
datacenters = [var.gcp_zone]

priority = 85
priority = 90

group "client-orchestrator" {
network {
Expand Down
7 changes: 3 additions & 4 deletions packages/nomad/otel-collector.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ job "otel-collector" {
priority = 95

group "collector" {
count = 1

network {
port "health" {
to = 13133
Expand Down Expand Up @@ -102,8 +100,9 @@ job "otel-collector" {
}

resources {
memory = 256
cpu = 256
max_memory = 2048
memory = 512
cpu = 512
}

template {
Expand Down
16 changes: 4 additions & 12 deletions packages/nomad/session-proxy.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,17 @@ variable "session_proxy_service_name" {
}

job "session-proxy" {
type = "system"
datacenters = [var.gcp_zone]

priority = 80

meta {
label1 = "job"
}

constraint {
operator = "distinct_hosts"
value = "true"
}

group "session-proxy" {
count = var.client_cluster_size

meta {
label1 = "group"
}

network {
port "session" {
static = var.session_proxy_port_number
Expand Down Expand Up @@ -78,8 +69,9 @@ job "session-proxy" {
}

resources {
memory = 1024
cpu = 128
max_memory = 2048
memory = 512
cpu = 512
}

template {
Expand Down