From b08314f43658efdb0709eeedf46d72ad2ccbfdbf Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Thu, 9 Jul 2020 15:05:47 -0400 Subject: [PATCH 1/2] nomad: recanonicalize network after connect hook --- nomad/job_endpoint_hook_connect.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nomad/job_endpoint_hook_connect.go b/nomad/job_endpoint_hook_connect.go index a6a941f71bc..b25601d6504 100644 --- a/nomad/job_endpoint_hook_connect.go +++ b/nomad/job_endpoint_hook_connect.go @@ -178,6 +178,9 @@ func groupConnectHook(job *structs.Job, g *structs.TaskGroup) error { } } } + + // re-canonicalize group network since this hook runs after canonicalizaton + g.Networks[0].Canonicalize() return nil } From 9f80e8592fb0df58f0a02dcd134c79a5dd00ecf4 Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Fri, 10 Jul 2020 10:29:07 -0400 Subject: [PATCH 2/2] nomad: canonicalize network in connect hook test --- nomad/job_endpoint_hook_connect_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/nomad/job_endpoint_hook_connect_test.go b/nomad/job_endpoint_hook_connect_test.go index 87bc2218e55..cb9ca321f18 100644 --- a/nomad/job_endpoint_hook_connect_test.go +++ b/nomad/job_endpoint_hook_connect_test.go @@ -100,6 +100,7 @@ func TestJobEndpointConnect_groupConnectHook(t *testing.T) { To: -1, }, } + tgOut.Networks[0].Canonicalize() require.NoError(t, groupConnectHook(job, job.TaskGroups[0])) require.Exactly(t, tgOut, job.TaskGroups[0])