faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-20 23:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add secret management to the update handler

Browse Source 
**What**
- Pass secrets to the updateSpec method

Signed-off-by: Lucas Roesler <roesler.lucas@gmail.com>
This commit is contained in:
Lucas Roesler
2017-11-07 10:11:59 +01:00
committed by Alex Ellis
parent 7c28f7d97e
commit 1a055deb49
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gateway/handlers/update_handler.go
View File

@ -45,7 +45,14 @@ func MakeUpdateFunctionHandler(metricsOptions metrics.MetricOptions, c *client.C
return return
} }
updateSpec(&request, &service.Spec, maxRestarts, restartDelay) secrets, err := makeSecretsArray(c, request.Secrets)
if err != nil {
log.Println(err)
w.WriteHeader(http.StatusBadRequest)
w.Write([]byte("Deployment error: " + err.Error()))
return
}
updateSpec(&request, &service.Spec, maxRestarts, restartDelay, secrets)
updateOpts := types.ServiceUpdateOptions{} updateOpts := types.ServiceUpdateOptions{}
updateOpts.RegistryAuthFrom = types.RegistryAuthFromSpec updateOpts.RegistryAuthFrom = types.RegistryAuthFromSpec
@ -72,7 +79,7 @@ func MakeUpdateFunctionHandler(metricsOptions metrics.MetricOptions, c *client.C
} }
} }
func updateSpec(request *requests.CreateFunctionRequest, spec *swarm.ServiceSpec, maxRestarts uint64, restartDelay time.Duration) { func updateSpec(request *requests.CreateFunctionRequest, spec *swarm.ServiceSpec, maxRestarts uint64, restartDelay time.Duration, secrets []*swarm.SecretReference) {
constraints := []string{} constraints := []string{}
if request.Constraints != nil && len(request.Constraints) > 0 { if request.Constraints != nil && len(request.Constraints) > 0 {
@ -103,6 +110,7 @@ func updateSpec(request *requests.CreateFunctionRequest, spec *swarm.ServiceSpec
Target: request.Network, Target: request.Network,
}, },
} }
spec.TaskTemplate.ContainerSpec.Secrets = secrets
spec.TaskTemplate.Resources = buildResources(request) spec.TaskTemplate.Resources = buildResources(request)