Set working directory for faasd / faas-containerd

* faasd writes secrets to wd + /secrets/*
* faas-containerd is passed a custom path to use to load the
secrets

Both services gain their work /run/ folders for temporary and
working files. Tested on RPi3 e2e with faasd install.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2020-01-05 09:48:58 +00:00
committed by Alex Ellis
parent 3068d03279
commit d135999d3b
4 changed files with 57 additions and 26 deletions

View File

@ -64,10 +64,9 @@ func DaemonReload() error {
return nil
}
func InstallUnit(name, folder string) error {
if len(folder) == 0 {
wd, _ := os.Getwd()
folder = wd
func InstallUnit(name string, tokens map[string]string) error {
if len(tokens["Cwd"]) == 0 {
return fmt.Errorf("key Cwd expected in tokens parameter")
}
tmplName := "./hack/" + name + ".service"
@ -78,13 +77,8 @@ func InstallUnit(name, folder string) error {
}
var tpl bytes.Buffer
userData := struct {
Cwd string
}{
Cwd: folder,
}
err = tmpl.Execute(&tpl, userData)
err = tmpl.Execute(&tpl, tokens)
if err != nil {
return err
}