kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add sidecar_task stanza parsing (#6104)

Browse Source 
* jobspec: breakup parse.go into smaller files

* add sidecar_task parsing to jobspec and api

* jobspec: combine service parsing logic for task and group service stanzas

* api: use slice of ConsulUpstream values instead of pointers
This commit is contained in:
Nick Ethier
2019-08-09 15:18:53 -04:00
committed by GitHub
parent b4aab30d7e
commit 07ce33a747
12 changed files with 1678 additions and 1617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
command/agent/job_endpoint.go
View File

@@ -1007,39 +1007,50 @@ func ApiServicesToStructs(in []*api.Service) []*structs.Service {
}
}
if s.Connect == nil {
continue
if s.Connect != nil {
out[i].Connect = ApiConsulConnectToStructs(s.Connect)
}
out[i].Connect = &structs.ConsulConnect{
Native: s.Connect.Native,
}
return out
}
func ApiConsulConnectToStructs(in *api.ConsulConnect) *structs.ConsulConnect {
if in == nil {
return nil
}
out := &structs.ConsulConnect{
Native: in.Native,
}
if in.SidecarService != nil {
out.SidecarService = &structs.ConsulSidecarService{
Port: in.SidecarService.Port,
}
if s.Connect.SidecarService == nil {
continue
}
if in.SidecarService.Proxy != nil {
out[i].Connect.SidecarService = &structs.ConsulSidecarService{
Port: s.Connect.SidecarService.Port,
}
if s.Connect.SidecarService.Proxy == nil {
continue
}
out[i].Connect.SidecarService.Proxy = &structs.ConsulProxy{
Config: s.Connect.SidecarService.Proxy.Config,
}
upstreams := make([]*structs.ConsulUpstream, len(s.Connect.SidecarService.Proxy.Upstreams))
for i, p := range s.Connect.SidecarService.Proxy.Upstreams {
upstreams[i] = &structs.ConsulUpstream{
DestinationName: p.DestinationName,
LocalBindPort: p.LocalBindPort,
out.SidecarService.Proxy = &structs.ConsulProxy{
Config: in.SidecarService.Proxy.Config,
}
}
out[i].Connect.SidecarService.Proxy.Upstreams = upstreams
upstreams := make([]structs.ConsulUpstream, len(in.SidecarService.Proxy.Upstreams))
for i, p := range in.SidecarService.Proxy.Upstreams {
upstreams[i] = structs.ConsulUpstream{
DestinationName: p.DestinationName,
LocalBindPort: p.LocalBindPort,
}
}
out.SidecarService.Proxy.Upstreams = upstreams
}
}
if in.SidecarTask != nil {
ApiTaskToStructsTask(in.SidecarTask, out.SidecarTask)
}
return out