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

Move to openfaas org

Browse Source 
Closes: #36

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd) 2020-02-06 09:36:18 +00:00
parent b06364c3f4
commit 592f3d3cc0
13 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -25,8 +25,8 @@ prepare-test:
sudo /sbin/sysctl -w net.ipv4.conf.all.forwarding=1 sudo /sbin/sysctl -w net.ipv4.conf.all.forwarding=1
sudo mkdir -p /opt/cni/bin sudo mkdir -p /opt/cni/bin
curl -sSL https://github.com/containernetworking/plugins/releases/download/$(CNI_VERSION)/cni-plugins-linux-$(ARCH)-$(CNI_VERSION).tgz | sudo tar -xz -C /opt/cni/bin curl -sSL https://github.com/containernetworking/plugins/releases/download/$(CNI_VERSION)/cni-plugins-linux-$(ARCH)-$(CNI_VERSION).tgz | sudo tar -xz -C /opt/cni/bin
sudo cp $(GOPATH)/src/github.com/alexellis/faasd/bin/faasd /usr/local/bin/ sudo cp $(GOPATH)/src/github.com/openfaas/faasd/bin/faasd /usr/local/bin/
cd $(GOPATH)/src/github.com/alexellis/faasd/ && sudo /usr/local/bin/faasd install cd $(GOPATH)/src/github.com/openfaas/faasd/ && sudo /usr/local/bin/faasd install
sudo systemctl status -l containerd --no-pager sudo systemctl status -l containerd --no-pager
sudo journalctl -u faasd-provider --no-pager sudo journalctl -u faasd-provider --no-pager
sudo systemctl status -l faasd-provider --no-pager sudo systemctl status -l faasd-provider --no-pager

12
README.md
View File

@ -1,6 +1,6 @@
# faasd - serverless with containerd # faasd - serverless with containerd
[![Build Status](https://travis-ci.com/alexellis/faasd.svg?branch=master)](https://travis-ci.com/alexellis/faasd) [![Build Status](https://travis-ci.com/openfaas/faasd.svg?branch=master)](https://travis-ci.com/openfaas/faasd)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![OpenFaaS](https://img.shields.io/badge/openfaas-serverless-blue.svg)](https://www.openfaas.com) [![OpenFaaS](https://img.shields.io/badge/openfaas-serverless-blue.svg)](https://www.openfaas.com)
@ -224,7 +224,7 @@ curl -sSL https://github.com/containernetworking/plugins/releases/download/${CNI
Run or install faasd, which brings up the gateway and Prometheus as containers Run or install faasd, which brings up the gateway and Prometheus as containers
```sh ```sh
cd $GOPATH/src/github.com/alexellis/faasd cd $GOPATH/src/github.com/openfaas/faasd
go build go build
# Install with systemd # Install with systemd
@ -238,17 +238,17 @@ go build
```sh ```sh
# For x86_64 # For x86_64
sudo curl -fSLs "https://github.com/alexellis/faasd/releases/download/0.6.2/faasd" \ sudo curl -fSLs "https://github.com/openfaas/faasd/releases/download/0.6.2/faasd" \
-o "/usr/local/bin/faasd" \ -o "/usr/local/bin/faasd" \
&& sudo chmod a+x "/usr/local/bin/faasd" && sudo chmod a+x "/usr/local/bin/faasd"
# armhf # armhf
sudo curl -fSLs "https://github.com/alexellis/faasd/releases/download/0.6.2/faasd-armhf" \ sudo curl -fSLs "https://github.com/openfaas/faasd/releases/download/0.6.2/faasd-armhf" \
-o "/usr/local/bin/faasd" \ -o "/usr/local/bin/faasd" \
&& sudo chmod a+x "/usr/local/bin/faasd" && sudo chmod a+x "/usr/local/bin/faasd"
# arm64 # arm64
sudo curl -fSLs "https://github.com/alexellis/faasd/releases/download/0.6.2/faasd-arm64" \ sudo curl -fSLs "https://github.com/openfaas/faasd/releases/download/0.6.2/faasd-arm64" \
-o "/usr/local/bin/faasd" \ -o "/usr/local/bin/faasd" \
&& sudo chmod a+x "/usr/local/bin/faasd" && sudo chmod a+x "/usr/local/bin/faasd"
``` ```
@ -284,7 +284,7 @@ The default Basic Auth username is `admin`, which is written to `/var/lib/faasd/
#### Installation with systemd #### Installation with systemd
* `faasd install` - install faasd and containerd with systemd, this must be run from `$GOPATH/src/github.com/alexellis/faasd` * `faasd install` - install faasd and containerd with systemd, this must be run from `$GOPATH/src/github.com/openfaas/faasd`
* `journalctl -u faasd -f` - faasd service logs * `journalctl -u faasd -f` - faasd service logs
* `journalctl -u faasd-provider -f` - faasd-provider service logs * `journalctl -u faasd-provider -f` - faasd-provider service logs

6
cloud-config.txt
View File

@ -15,9 +15,9 @@ runcmd:
- mkdir -p /opt/cni/bin - mkdir -p /opt/cni/bin
- curl -sSL https://github.com/containernetworking/plugins/releases/download/v0.8.5/cni-plugins-linux-amd64-v0.8.5.tgz | tar -xz -C /opt/cni/bin - curl -sSL https://github.com/containernetworking/plugins/releases/download/v0.8.5/cni-plugins-linux-amd64-v0.8.5.tgz | tar -xz -C /opt/cni/bin
- mkdir -p /go/src/github.com/alexellis/ - mkdir -p /go/src/github.com/alexellis/
- cd /go/src/github.com/alexellis/ && git clone https://github.com/alexellis/faasd - cd /go/src/github.com/alexellis/ && git clone https://github.com/openfaas/faasd
- curl -fSLs "https://github.com/alexellis/faasd/releases/download/0.7.3/faasd" --output "/usr/local/bin/faasd" && chmod a+x "/usr/local/bin/faasd" - curl -fSLs "https://github.com/openfaas/faasd/releases/download/0.7.3/faasd" --output "/usr/local/bin/faasd" && chmod a+x "/usr/local/bin/faasd"
- cd /go/src/github.com/alexellis/faasd/ && /usr/local/bin/faasd install - cd /go/src/github.com/openfaas/faasd/ && /usr/local/bin/faasd install
- systemctl status -l containerd --no-pager - systemctl status -l containerd --no-pager
- journalctl -u faasd-provider --no-pager - journalctl -u faasd-provider --no-pager
- systemctl status -l faasd-provider --no-pager - systemctl status -l faasd-provider --no-pager

2
cmd/install.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
"path" "path"
systemd "github.com/alexellis/faasd/pkg/systemd" systemd "github.com/openfaas/faasd/pkg/systemd"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"

6
cmd/provider.go
View File

@ -9,9 +9,9 @@ import (
"os" "os"
"path" "path"
"github.com/alexellis/faasd/pkg/cninetwork" "github.com/openfaas/faasd/pkg/cninetwork"
"github.com/alexellis/faasd/pkg/provider/config" "github.com/openfaas/faasd/pkg/provider/config"
"github.com/alexellis/faasd/pkg/provider/handlers" "github.com/openfaas/faasd/pkg/provider/handlers"
"github.com/containerd/containerd" "github.com/containerd/containerd"
bootstrap "github.com/openfaas/faas-provider" bootstrap "github.com/openfaas/faas-provider"
"github.com/openfaas/faas-provider/proxy" "github.com/openfaas/faas-provider/proxy"

2
cmd/up.go
View File

@ -14,7 +14,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/alexellis/faasd/pkg" "github.com/openfaas/faasd/pkg"
"github.com/alexellis/k3sup/pkg/env" "github.com/alexellis/k3sup/pkg/env"
"github.com/sethvargo/go-password/password" "github.com/sethvargo/go-password/password"
"github.com/spf13/cobra" "github.com/spf13/cobra"

2
main.go
View File

@ -3,7 +3,7 @@ package main
import ( import (
"os" "os"
"github.com/alexellis/faasd/cmd" "github.com/openfaas/faasd/cmd"
) )
// These values will be injected into these variables at the build time. // These values will be injected into these variables at the build time.

4
pkg/provider/handlers/delete.go
View File

@ -8,8 +8,8 @@ import (
"log" "log"
"net/http" "net/http"
cninetwork "github.com/alexellis/faasd/pkg/cninetwork" cninetwork "github.com/openfaas/faasd/pkg/cninetwork"
"github.com/alexellis/faasd/pkg/service" "github.com/openfaas/faasd/pkg/service"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
gocni "github.com/containerd/go-cni" gocni "github.com/containerd/go-cni"

4
pkg/provider/handlers/deploy.go
View File

@ -11,8 +11,8 @@ import (
"path" "path"
"strings" "strings"
cninetwork "github.com/alexellis/faasd/pkg/cninetwork" cninetwork "github.com/openfaas/faasd/pkg/cninetwork"
"github.com/alexellis/faasd/pkg/service" "github.com/openfaas/faasd/pkg/service"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"

2
pkg/provider/handlers/functions.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/alexellis/faasd/pkg/cninetwork" "github.com/openfaas/faasd/pkg/cninetwork"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
) )

6
pkg/provider/handlers/secret.go
View File

@ -95,12 +95,6 @@ func deleteSecret(c *containerd.Client, w http.ResponseWriter, r *http.Request,
return return
} }
if err != nil {
log.Printf("[secret] error %s", err.Error())
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
err = os.Remove(path.Join(mountPath, secret.Name)) err = os.Remove(path.Join(mountPath, secret.Name))
if err != nil { if err != nil {

4
pkg/provider/handlers/update.go
View File

@ -8,8 +8,8 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/alexellis/faasd/pkg/cninetwork" "github.com/openfaas/faasd/pkg/cninetwork"
"github.com/alexellis/faasd/pkg/service" "github.com/openfaas/faasd/pkg/service"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
gocni "github.com/containerd/go-cni" gocni "github.com/containerd/go-cni"

4
pkg/supervisor.go
View File

@ -8,8 +8,8 @@ import (
"os" "os"
"path" "path"
"github.com/alexellis/faasd/pkg/cninetwork" "github.com/openfaas/faasd/pkg/cninetwork"
"github.com/alexellis/faasd/pkg/service" "github.com/openfaas/faasd/pkg/service"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"