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

Set working directory for faasd / faas-containerd

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

49
cmd/install.go
View File

@ -2,6 +2,7 @@ package cmd
import (
"fmt"
"io"
"os"
"path"
@ -17,14 +18,28 @@ var installCmd = &cobra.Command{
RunE: runInstall,
}
const faasdwd = "/run/faasd"
const faasContainerdwd = "/run/faas-containerd"
func runInstall(_ *cobra.Command, _ []string) error {
if basicAuthErr := makeBasicAuthFiles(); basicAuthErr != nil {
if err := ensureWorkingDir(path.Join(faasdwd, "secrets")); err != nil {
return err
}
if err := ensureWorkingDir(faasContainerdwd); err != nil {
return err
}
if basicAuthErr := makeBasicAuthFiles(path.Join(faasdwd, "secrets")); basicAuthErr != nil {
return errors.Wrap(basicAuthErr, "cannot create basic-auth-* files")
}
wd := "/run/faasd"
if err := ensureWorkingDir(wd); err != nil {
if err := cp("prometheus.yml", faasdwd); err != nil {
return err
}
if err := cp("resolv.conf", faasdwd); err != nil {
return err
}
@ -43,12 +58,15 @@ func runInstall(_ *cobra.Command, _ []string) error {
return err
}
err = systemd.InstallUnit("faas-containerd", wd)
err = systemd.InstallUnit("faas-containerd", map[string]string{
"Cwd": faasContainerdwd,
"SecretMountPath": path.Join(faasdwd, "secrets")})
if err != nil {
return err
}
err = systemd.InstallUnit("faasd", wd)
err = systemd.InstallUnit("faasd", map[string]string{"Cwd": faasdwd})
if err != nil {
return err
}
@ -91,7 +109,7 @@ func binExists(folder, name string) error {
func ensureWorkingDir(folder string) error {
if _, err := os.Stat(folder); err != nil {
err = os.MkdirAll("/run/faasd", 0600)
err = os.MkdirAll(folder, 0600)
if err != nil {
return err
}
@ -99,3 +117,22 @@ func ensureWorkingDir(folder string) error {
return nil
}
func cp(source, destFolder string) error {
file, err := os.Open(source)
if err != nil {
return err
}
defer file.Close()
out, err := os.Create(path.Join(destFolder, source))
if err != nil {
return err
}
defer out.Close()
_, err = io.Copy(out, file)
return err
}