luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Add 'nomad.advertise.address' to client meta via NomadFingerPrint 

This change removes the addition of the advertise address to the
exported task env vars and instead moves this work into the
NomadFingerprint.Fingerprint which adds this value to the client
attrs. This can then be used within a Nomad job like
${attr.nomad.advertise.address}.
This commit is contained in:
James Rasell 2018-06-08 09:44:10 +02:00
parent 367a8b5152
commit b9009c419c
No known key found for this signature in database
GPG Key ID: AA7D460F5C8377AA
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/driver/env/env.go vendored
View File

@ -59,10 +59,6 @@ const (
// Region is the environment variable for passing the region in which the alloc is running.
Region = "NOMAD_REGION"
// NomadAdvertiseAddr is the environment variable for passing the client HTTP
// advertise address. GH-4381.
NomadAdvertiseAddr = "NOMAD_ADVERTISE_ADDR"
// AddrPrefix is the prefix for passing both dynamic and static port
// allocations to tasks.
// E.g $NOMAD_ADDR_http=127.0.0.1:80
@ -217,7 +213,6 @@ type Builder struct {
allocIndex int
datacenter string
region string
nomadAdvertiseAddr string
allocId string
allocName string
groupName string
@ -311,9 +306,6 @@ func (b *Builder) Build() *TaskEnv {
// Copy region over to node attrs
nodeAttrs[nodeRegionKey] = b.region
}
if b.nomadAdvertiseAddr != "" {
envMap[NomadAdvertiseAddr] = b.nomadAdvertiseAddr
}
// Build the network related env vars
buildNetworkEnv(envMap, b.networks, b.driverNetwork)
@ -453,7 +445,6 @@ func (b *Builder) setNode(n *structs.Node) *Builder {
b.nodeAttrs[nodeClassKey] = n.NodeClass
b.nodeAttrs[nodeDcKey] = n.Datacenter
b.datacenter = n.Datacenter
b.nomadAdvertiseAddr = n.HTTPAddr
// Set up the attributes.
for k, v := range n.Attributes {

1
client/fingerprint/nomad.go
View File

@ -19,6 +19,7 @@ func NewNomadFingerprint(logger *log.Logger) Fingerprint {
}
func (f *NomadFingerprint) Fingerprint(req *cstructs.FingerprintRequest, resp *cstructs.FingerprintResponse) error {
resp.AddAttribute("nomad.advertise.address", req.Node.HTTPAddr)
resp.AddAttribute("nomad.version", req.Config.Version.VersionNumber())
resp.AddAttribute("nomad.revision", req.Config.Version.Revision)
resp.Detected = true

13
client/fingerprint/nomad_test.go
View File

@ -11,17 +11,20 @@ import (
func TestNomadFingerprint(t *testing.T) {
f := NewNomadFingerprint(testLogger())
node := &structs.Node{
Attributes: make(map[string]string),
}
v := "foo"
r := "123"
h := "8.8.8.8:4646"
c := &config.Config{
Version: &version.VersionInfo{
Revision: r,
Version: v,
},
}
node := &structs.Node{
Attributes: make(map[string]string),
HTTPAddr: h,
}
request := &cstructs.FingerprintRequest{Config: c, Node: node}
var response cstructs.FingerprintResponse
@ -45,4 +48,8 @@ func TestNomadFingerprint(t *testing.T) {
if response.Attributes["nomad.revision"] != r {
t.Fatalf("incorrect revision")
}
if response.Attributes["nomad.advertise.address"] != h {
t.Fatalf("incorrect advertise address")
}
}