-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7515 from hashicorp/f-connect-expose-checks-percheck
connect: enable automatic expose paths for TG service checks
- Loading branch information
Showing
12 changed files
with
1,118 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| job "group_service_proxy_expose" { | ||
| group "group" { | ||
| service { | ||
| name = "example" | ||
| connect { | ||
| sidecar_service { | ||
| proxy { | ||
| } | ||
| } | ||
| } | ||
|
|
||
| check { | ||
| name = "example-check1" | ||
| expose = true | ||
| } | ||
|
|
||
| check { | ||
| name = "example-check2" | ||
| expose = false | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,228 @@ | ||
| package nomad | ||
|
|
||
| import ( | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/nomad/nomad/structs" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| type jobExposeCheckHook struct{} | ||
|
|
||
| func (jobExposeCheckHook) Name() string { | ||
| return "expose-check" | ||
| } | ||
|
|
||
| // Mutate will scan every task group for group-services which have checks defined | ||
| // that have the Expose field configured, and generate expose path configurations | ||
| // extrapolated from those check definitions. | ||
| func (jobExposeCheckHook) Mutate(job *structs.Job) (_ *structs.Job, warnings []error, err error) { | ||
| for _, tg := range job.TaskGroups { | ||
| for _, s := range tg.Services { | ||
| for _, c := range s.Checks { | ||
| if c.Expose { | ||
| if exposePath, err := exposePathForCheck(tg, s, c); err != nil { | ||
| return nil, nil, err | ||
| } else if exposePath != nil { | ||
| serviceExposeConfig := serviceExposeConfig(s) | ||
| // insert only if not already present - required for job | ||
| // updates which would otherwise create duplicates | ||
| if !containsExposePath(serviceExposeConfig.Paths, *exposePath) { | ||
| serviceExposeConfig.Paths = append( | ||
| serviceExposeConfig.Paths, *exposePath, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return job, nil, nil | ||
| } | ||
|
|
||
| // Validate will ensure: | ||
| // - The job contains valid network configuration for each task group in which | ||
| // an expose path is configured. The network must be of type bridge mode. | ||
| // - The check Expose field is configured only for connect-enabled group-services. | ||
| func (jobExposeCheckHook) Validate(job *structs.Job) (warnings []error, err error) { | ||
| for _, tg := range job.TaskGroups { | ||
| // Make sure any group that contains a group-service that enables expose | ||
| // is configured with one network that is in "bridge" mode. This check | ||
| // is being done independently of the preceding Connect task injection | ||
| // hook, because at some point in the future Connect will not require the | ||
| // use of network namespaces, whereas the use of "expose" does not make | ||
| // sense without the use of network namespace. | ||
| if err := tgValidateUseOfBridgeMode(tg); err != nil { | ||
| return nil, err | ||
| } | ||
| // Make sure any group-service that contains a check that enables expose | ||
| // is connect-enabled and does not specify a custom sidecar task. We only | ||
| // support the expose feature when using the built-in Envoy integration. | ||
| if err := tgValidateUseOfCheckExpose(tg); err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| return nil, nil | ||
| } | ||
|
|
||
| // serviceExposeConfig digs through s to extract the connect sidecar service proxy | ||
| // expose configuration. It is not required of the user to provide this, so it | ||
| // is created on demand here as needed in the case where any service check exposes | ||
| // itself. | ||
| // | ||
| // The service, connect, and sidecar_service are assumed not to be nil, as they | ||
| // are enforced in previous hooks / validation. | ||
| func serviceExposeConfig(s *structs.Service) *structs.ConsulExposeConfig { | ||
| if s.Connect.SidecarService.Proxy == nil { | ||
| s.Connect.SidecarService.Proxy = new(structs.ConsulProxy) | ||
| } | ||
| if s.Connect.SidecarService.Proxy.Expose == nil { | ||
| s.Connect.SidecarService.Proxy.Expose = new(structs.ConsulExposeConfig) | ||
| } | ||
| return s.Connect.SidecarService.Proxy.Expose | ||
| } | ||
|
|
||
| // containsExposePath returns true if path is contained in paths. | ||
| func containsExposePath(paths []structs.ConsulExposePath, path structs.ConsulExposePath) bool { | ||
| for _, p := range paths { | ||
| if p == path { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| // tgValidateUseOfCheckExpose ensures that any service check in tg making use | ||
| // of the expose field is within an appropriate context to do so. The check must | ||
| // be a group level check, and must use the builtin envoy proxy. | ||
| func tgValidateUseOfCheckExpose(tg *structs.TaskGroup) error { | ||
| // validation for group services (which must use built-in connect proxy) | ||
| for _, s := range tg.Services { | ||
| for _, check := range s.Checks { | ||
| if check.Expose && !serviceUsesConnectEnvoy(s) { | ||
| return errors.Errorf( | ||
| "exposed service check %s->%s->%s requires use of Nomad's builtin Connect proxy", | ||
| tg.Name, s.Name, check.Name, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // validation for task services (which must not be configured to use Expose) | ||
| for _, t := range tg.Tasks { | ||
| for _, s := range t.Services { | ||
| for _, check := range s.Checks { | ||
| if check.Expose { | ||
| return errors.Errorf( | ||
| "exposed service check %s[%s]->%s->%s is not a task-group service", | ||
| tg.Name, t.Name, s.Name, check.Name, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // tgValidateUseOfBridgeMode ensures there is exactly 1 network configured for | ||
| // the task group, and that it makes use of "bridge" mode (i.e. enables network | ||
| // namespaces). | ||
| func tgValidateUseOfBridgeMode(tg *structs.TaskGroup) error { | ||
| if tgUsesExposeCheck(tg) { | ||
| if len(tg.Networks) != 1 { | ||
| return errors.Errorf("group %q must specify one bridge network for exposing service check(s)", tg.Name) | ||
| } | ||
| if tg.Networks[0].Mode != "bridge" { | ||
| return errors.Errorf("group %q must use bridge network for exposing service check(s)", tg.Name) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // tgUsesExposeCheck returns true if any group service in the task group makes | ||
| // use of the expose field. | ||
| func tgUsesExposeCheck(tg *structs.TaskGroup) bool { | ||
| for _, s := range tg.Services { | ||
| for _, check := range s.Checks { | ||
| if check.Expose { | ||
| return true | ||
| } | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| // serviceUsesConnectEnvoy returns true if the service is going to end up using | ||
| // the built-in envoy proxy. | ||
| // | ||
| // This implementation is kind of reading tea leaves - firstly Connect | ||
| // must be enabled, and second the sidecar_task must not be overridden. If these | ||
| // conditions are met, the preceding connect hook will have injected a Connect | ||
| // sidecar task, the configuration of which is interpolated at runtime. | ||
| func serviceUsesConnectEnvoy(s *structs.Service) bool { | ||
| // A non-nil connect stanza implies this service isn't connect enabled in | ||
| // the first place. | ||
| if s.Connect == nil { | ||
| return false | ||
| } | ||
|
|
||
| // A non-nil connect.sidecar_task stanza implies the sidecar task is being | ||
| // overridden (i.e. the default Envoy is not being uesd). | ||
| if s.Connect.SidecarTask != nil { | ||
| return false | ||
| } | ||
|
|
||
| return true | ||
| } | ||
|
|
||
| // checkIsExposable returns true if check is qualified for automatic generation | ||
| // of connect proxy expose path configuration based on configured consul checks. | ||
| // To qualify, the check must be of type "http" or "grpc", and must have a Path | ||
| // configured. | ||
| func checkIsExposable(check *structs.ServiceCheck) bool { | ||
| switch strings.ToLower(check.Type) { | ||
| case "grpc", "http": | ||
| return strings.HasPrefix(check.Path, "/") | ||
| default: | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| // exposePathForCheck extrapolates the necessary expose path configuration for | ||
| // the given consul service check. If the check is not compatible, nil is | ||
| // returned. | ||
| func exposePathForCheck(tg *structs.TaskGroup, s *structs.Service, check *structs.ServiceCheck) (*structs.ConsulExposePath, error) { | ||
| if !checkIsExposable(check) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| // Determine the local service port (i.e. what port the service is actually | ||
| // listening to inside the network namespace). | ||
| // | ||
| // Similar logic exists in getAddress of client.go which is used for | ||
| // creating check & service registration objects. | ||
| // | ||
| // The difference here is the address is predestined to be localhost since | ||
| // it is binding inside the namespace. | ||
| var port int | ||
| if _, port = tg.Networks.Port(s.PortLabel); port <= 0 { // try looking up by port label | ||
| if port, _ = strconv.Atoi(s.PortLabel); port <= 0 { // then try direct port value | ||
| return nil, errors.Errorf( | ||
| "unable to determine local service port for service check %s->%s->%s", | ||
| tg.Name, s.Name, check.Name, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| // The Path, Protocol, and PortLabel are just copied over from the service | ||
| // check definition. It is required that the user configure their own port | ||
| // mapping for each check, including setting the 'to = -1' sentinel value | ||
| // enabling the network namespace pass-through. | ||
| return &structs.ConsulExposePath{ | ||
| Path: check.Path, | ||
| Protocol: check.Protocol, | ||
| LocalPathPort: port, | ||
| ListenerPort: check.PortLabel, | ||
| }, nil | ||
| } |
Oops, something went wrong.