Skip to content

Commit

Permalink
ingress-gateway: fixup port block & comments in examples
Browse files Browse the repository at this point in the history
  • Loading branch information
shoenig committed Aug 26, 2020
1 parent 4ed74d2 commit 394bde8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
11 changes: 6 additions & 5 deletions ingress-gateway/ig-bridge-demo.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ job "ig-bridge-demo" {

datacenters = ["dc1"]

# This group will have a task providing the ingress gateway automatically
# created by Nomad. The ingress gateway is based on the Envoy proxy being
# managed by the docker driver.
group "ingress-group" {

network {
Expand All @@ -22,7 +25,7 @@ job "ig-bridge-demo" {
connect {
gateway {

// Consul gateway [envoy] proxy options.
# Consul gateway [envoy] proxy options.
proxy {
# The following options are automatically set by Nomad if not
# explicitly configured when using bridge networking.
Expand All @@ -37,7 +40,7 @@ job "ig-bridge-demo" {
# https://www.nomadproject.io/docs/job-specification/gateway#proxy-parameters
}

// Consul Ingress Gateway Configuration Entry.
# Consul Ingress Gateway Configuration Entry.
ingress {
# Nomad will automatically manage the Configuration Entry in Consul
# given the parameters in the ingress block.
Expand Down Expand Up @@ -65,9 +68,7 @@ job "ig-bridge-demo" {
group "generator" {
network {
mode = "host"
port "api" {
to = -1
}
port "api" {}
}

service {
Expand Down
8 changes: 5 additions & 3 deletions ingress-gateway/ig-demo.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ job "ig-demo" {

datacenters = ["dc1"]

# This group will have a task providing the ingress gateway automatically
# created by Nomad. The ingress gateway is based on the Envoy proxy being
# managed by the docker driver.
group "ingress-group" {

network {
Expand Down Expand Up @@ -31,14 +34,14 @@ job "ig-demo" {
connect {
gateway {

// Consul gateway [envoy] proxy options.
# Consul gateway [envoy] proxy options.
proxy {
# Envoy proxy options are documented at
# https://www.nomadproject.io/docs/job-specification/gateway#proxy-parameters
connect_timeout = "500ms"
}

// Consul Ingress Gateway Configuration Entry.
# Consul Ingress Gateway Configuration Entry.
ingress {
# Nomad will automatically manage the Configuration Entry in Consul
# given the parameters in the ingress block.
Expand Down Expand Up @@ -95,4 +98,3 @@ job "ig-demo" {
}
}
}

0 comments on commit 394bde8

Please sign in to comment.