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

fix namespaces

Browse source
This commit is contained in:
Alex Dadgar 2017-10-23 16:07:38 -07:00
parent 9c573482c5
commit 2d43e527d1
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
command/agent/job_endpoint.go
View file

@ -132,6 +132,8 @@ func (s *HTTPServer) jobPlan(resp http.ResponseWriter, req *http.Request,
}, },
} }
s.parseWriteRequest(req, &planReq.WriteRequest) s.parseWriteRequest(req, &planReq.WriteRequest)
planReq.Namespace = sJob.Namespace
var out structs.JobPlanResponse var out structs.JobPlanResponse
if err := s.agent.RPC("Job.Plan", &planReq, &out); err != nil { if err := s.agent.RPC("Job.Plan", &planReq, &out); err != nil {
return nil, err return nil, err
@ -162,6 +164,7 @@ func (s *HTTPServer) ValidateJobRequest(resp http.ResponseWriter, req *http.Requ
}, },
} }
s.parseWriteRequest(req, &args.WriteRequest) s.parseWriteRequest(req, &args.WriteRequest)
args.Namespace = job.Namespace
var out structs.JobValidateResponse var out structs.JobValidateResponse
if err := s.agent.RPC("Job.Validate", &args, &out); err != nil { if err := s.agent.RPC("Job.Validate", &args, &out); err != nil {
@ -363,6 +366,8 @@ func (s *HTTPServer) jobUpdate(resp http.ResponseWriter, req *http.Request,
}, },
} }
s.parseWriteRequest(req, &regReq.WriteRequest) s.parseWriteRequest(req, &regReq.WriteRequest)
regReq.Namespace = sJob.Namespace
var out structs.JobRegisterResponse var out structs.JobRegisterResponse
if err := s.agent.RPC("Job.Register", &regReq, &out); err != nil { if err := s.agent.RPC("Job.Register", &regReq, &out); err != nil {
return nil, err return nil, err