From f696d3930dda2406bbaad226346dc04e64592527 Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Sun, 22 Oct 2017 22:07:29 +0100 Subject: [PATCH] Label support for Update handler Signed-off-by: Alex Ellis --- gateway/handlers/createhandler.go | 2 +- gateway/handlers/update_handler.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gateway/handlers/createhandler.go b/gateway/handlers/createhandler.go index 2ee7b4f0..1bc6497e 100644 --- a/gateway/handlers/createhandler.go +++ b/gateway/handlers/createhandler.go @@ -75,7 +75,7 @@ func makeSpec(request *requests.CreateFunctionRequest, maxRestarts uint64, resta } labels := map[string]string{"function": "true"} if request.Labels != nil { - for k, v := range request.Labels { + for k, v := range *request.Labels { labels[k] = v } } diff --git a/gateway/handlers/update_handler.go b/gateway/handlers/update_handler.go index 18209fea..5cabf595 100644 --- a/gateway/handlers/update_handler.go +++ b/gateway/handlers/update_handler.go @@ -93,6 +93,13 @@ func updateSpec(request *requests.CreateFunctionRequest, spec *swarm.ServiceSpec "function": "true", "uid": fmt.Sprintf("%d", time.Now().Nanosecond()), } + + if request.Labels != nil { + for k, v := range *request.Labels { + spec.TaskTemplate.ContainerSpec.Labels[k] = v + } + } + spec.TaskTemplate.Networks = nets spec.TaskTemplate.Placement = &swarm.Placement{ Constraints: constraints,