Various fixes

This commit is contained in:
Daniel Berteaud 2023-08-22 15:35:50 +02:00
parent e718f5b4af
commit 307071edf4
1 changed files with 7 additions and 5 deletions

View File

@ -3,7 +3,7 @@ job "egress-gateway" {
# Egress GW runs on ddedicated, unrestricted nodes
[[- if has .egress_gw "node_pool" ]]
node_pool = [[ .egress_gw.node_pool ]]
node_pool = [[ .egress_gw.node_pool | toJSON ]]
[[- end ]]
group "egress-gateway" {
@ -14,7 +14,7 @@ job "egress-gateway" {
# Terminating gateway definition
service {
name = "egress-gateway[[ .env_suffix ]]"
name = "egress-gateway[[ .env.suffix ]]"
connect {
gateway {
proxy {}
@ -22,11 +22,12 @@ job "egress-gateway" {
[[- range $service, $def := .egress_gw.services ]]
service {
name = [[ $service | toJSON ]]
[[- range $kv, $v := $def ]]
[[- range $k, $v := $def ]]
[[ $k ]] = [[ $v | toJSON ]]
[[- end ]]
}
[[- end ]]
}
}
sidecar_task {
config {
@ -40,14 +41,14 @@ job "egress-gateway" {
# Dummy task to configure custom CA certificates
# Needed because template is not supported in sidecar_task
task "downloader" {
task "ca-certs" {
driver = "exec"
config {
command = "/bin/true"
}
# The task will just quit immediatly, mark it as a prestart hook
# The task will just quit immediatly, mark it as a prestart hook
lifecycle {
hook = "prestart"
}
@ -59,6 +60,7 @@ job "egress-gateway" {
_EOF
destination = "${NOMAD_ALLOC_DIR}/data/[[ $k ]].crt"
}
[[- end ]]
# Give just enough resources
resources {