mirror of
https://github.com/kemko/nomad.git
synced 2026-01-05 01:45:44 +03:00
consul/connect: validate group network on expose port injection
In #7800, Nomad would automatically generate a port label for service checks making use of the expose feature, if the port was not already set. This change assumed the group network would be correctly defined (as is checked in a validation hook later). If the group network was not definied, a panic would occur on job submisssion. This change re-uses the group network validation helper to make sure the network is correctly definied before adding ports to it. Fixes #8875
This commit is contained in:
@@ -170,7 +170,7 @@ func serviceUsesConnectEnvoy(s *structs.Service) bool {
|
||||
}
|
||||
|
||||
// A non-nil connect.sidecar_task stanza implies the sidecar task is being
|
||||
// overridden (i.e. the default Envoy is not being uesd).
|
||||
// overridden (i.e. the default Envoy is not being used).
|
||||
if s.Connect.SidecarTask != nil {
|
||||
return false
|
||||
}
|
||||
@@ -199,6 +199,12 @@ func exposePathForCheck(tg *structs.TaskGroup, s *structs.Service, check *struct
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
// Borrow some of the validation before we start manipulating the group
|
||||
// network, which needs to exist once.
|
||||
if err := tgValidateUseOfBridgeMode(tg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// If the check is exposable but doesn't have a port label set build
|
||||
// a port with a generated label, add it to the group's Dynamic ports
|
||||
// and set the check port label to the generated label.
|
||||
|
||||
@@ -376,6 +376,30 @@ func TestJobExposeCheckHook_exposePathForCheck(t *testing.T) {
|
||||
ListenerPort: tg.Networks[0].DynamicPorts[0].Label,
|
||||
}, ePath)
|
||||
})
|
||||
|
||||
t.Run("missing network with no service check port label", func(t *testing.T) {
|
||||
// this test ensures we do not try to manipulate the group network
|
||||
// to inject an expose port if the group network does not exist
|
||||
c := &structs.ServiceCheck{
|
||||
Name: "check1",
|
||||
Type: "http",
|
||||
Path: "/health",
|
||||
PortLabel: "", // not set
|
||||
Expose: true, // will require a service check port label
|
||||
}
|
||||
s := &structs.Service{
|
||||
Name: "service1",
|
||||
Checks: []*structs.ServiceCheck{c},
|
||||
}
|
||||
tg := &structs.TaskGroup{
|
||||
Name: "group1",
|
||||
Services: []*structs.Service{s},
|
||||
Networks: nil, // not set, should cause validation error
|
||||
}
|
||||
ePath, err := exposePathForCheck(tg, s, c)
|
||||
require.EqualError(t, err, `group "group1" must specify one bridge network for exposing service check(s)`)
|
||||
require.Nil(t, ePath)
|
||||
})
|
||||
}
|
||||
|
||||
func TestJobExposeCheckHook_containsExposePath(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user