diff --git a/Makefile b/Makefile index 8397156..3a7153a 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,8 @@ prepare-test: sudo /sbin/sysctl -w net.ipv4.conf.all.forwarding=1 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 - sudo cp $(GOPATH)/src/github.com/alexellis/faasd/bin/faasd /usr/local/bin/ - cd $(GOPATH)/src/github.com/alexellis/faasd/ && sudo /usr/local/bin/faasd install + sudo cp $(GOPATH)/src/github.com/openfaas/faasd/bin/faasd /usr/local/bin/ + cd $(GOPATH)/src/github.com/openfaas/faasd/ && sudo /usr/local/bin/faasd install sudo systemctl status -l containerd --no-pager sudo journalctl -u faasd-provider --no-pager sudo systemctl status -l faasd-provider --no-pager diff --git a/README.md b/README.md index 0f9377e..3026da4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 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) [![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 ```sh -cd $GOPATH/src/github.com/alexellis/faasd +cd $GOPATH/src/github.com/openfaas/faasd go build # Install with systemd @@ -238,17 +238,17 @@ go build ```sh # 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" \ && sudo chmod a+x "/usr/local/bin/faasd" # 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" \ && sudo chmod a+x "/usr/local/bin/faasd" # 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" \ && 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 -* `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-provider -f` - faasd-provider service logs diff --git a/cloud-config.txt b/cloud-config.txt index c404e91..49fb9e3 100644 --- a/cloud-config.txt +++ b/cloud-config.txt @@ -15,9 +15,9 @@ runcmd: - 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 - mkdir -p /go/src/github.com/alexellis/ -- cd /go/src/github.com/alexellis/ && git clone https://github.com/alexellis/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" -- cd /go/src/github.com/alexellis/faasd/ && /usr/local/bin/faasd install +- cd /go/src/github.com/alexellis/ && git clone https://github.com/openfaas/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/openfaas/faasd/ && /usr/local/bin/faasd install - systemctl status -l containerd --no-pager - journalctl -u faasd-provider --no-pager - systemctl status -l faasd-provider --no-pager diff --git a/cmd/install.go b/cmd/install.go index 4325cef..653a608 100644 --- a/cmd/install.go +++ b/cmd/install.go @@ -6,7 +6,7 @@ import ( "os" "path" - systemd "github.com/alexellis/faasd/pkg/systemd" + systemd "github.com/openfaas/faasd/pkg/systemd" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/provider.go b/cmd/provider.go index 2d9db65..b31bc0e 100644 --- a/cmd/provider.go +++ b/cmd/provider.go @@ -9,9 +9,9 @@ import ( "os" "path" - "github.com/alexellis/faasd/pkg/cninetwork" - "github.com/alexellis/faasd/pkg/provider/config" - "github.com/alexellis/faasd/pkg/provider/handlers" + "github.com/openfaas/faasd/pkg/cninetwork" + "github.com/openfaas/faasd/pkg/provider/config" + "github.com/openfaas/faasd/pkg/provider/handlers" "github.com/containerd/containerd" bootstrap "github.com/openfaas/faas-provider" "github.com/openfaas/faas-provider/proxy" diff --git a/cmd/up.go b/cmd/up.go index 8b0f8a6..95351f5 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" - "github.com/alexellis/faasd/pkg" + "github.com/openfaas/faasd/pkg" "github.com/alexellis/k3sup/pkg/env" "github.com/sethvargo/go-password/password" "github.com/spf13/cobra" diff --git a/main.go b/main.go index 1adcd91..aa4e172 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/alexellis/faasd/cmd" + "github.com/openfaas/faasd/cmd" ) // These values will be injected into these variables at the build time. diff --git a/pkg/provider/handlers/delete.go b/pkg/provider/handlers/delete.go index dc6c1f3..18a6289 100644 --- a/pkg/provider/handlers/delete.go +++ b/pkg/provider/handlers/delete.go @@ -8,8 +8,8 @@ import ( "log" "net/http" - cninetwork "github.com/alexellis/faasd/pkg/cninetwork" - "github.com/alexellis/faasd/pkg/service" + cninetwork "github.com/openfaas/faasd/pkg/cninetwork" + "github.com/openfaas/faasd/pkg/service" "github.com/containerd/containerd" "github.com/containerd/containerd/namespaces" gocni "github.com/containerd/go-cni" diff --git a/pkg/provider/handlers/deploy.go b/pkg/provider/handlers/deploy.go index 3ec55c0..2fdbec8 100644 --- a/pkg/provider/handlers/deploy.go +++ b/pkg/provider/handlers/deploy.go @@ -11,8 +11,8 @@ import ( "path" "strings" - cninetwork "github.com/alexellis/faasd/pkg/cninetwork" - "github.com/alexellis/faasd/pkg/service" + cninetwork "github.com/openfaas/faasd/pkg/cninetwork" + "github.com/openfaas/faasd/pkg/service" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/namespaces" diff --git a/pkg/provider/handlers/functions.go b/pkg/provider/handlers/functions.go index 7338d6f..124eafb 100644 --- a/pkg/provider/handlers/functions.go +++ b/pkg/provider/handlers/functions.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/alexellis/faasd/pkg/cninetwork" + "github.com/openfaas/faasd/pkg/cninetwork" "github.com/containerd/containerd" "github.com/containerd/containerd/namespaces" ) diff --git a/pkg/provider/handlers/secret.go b/pkg/provider/handlers/secret.go index e1e42ee..1dd6d55 100644 --- a/pkg/provider/handlers/secret.go +++ b/pkg/provider/handlers/secret.go @@ -95,12 +95,6 @@ func deleteSecret(c *containerd.Client, w http.ResponseWriter, r *http.Request, 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)) if err != nil { diff --git a/pkg/provider/handlers/update.go b/pkg/provider/handlers/update.go index 9b6d5b2..088f1b4 100644 --- a/pkg/provider/handlers/update.go +++ b/pkg/provider/handlers/update.go @@ -8,8 +8,8 @@ import ( "log" "net/http" - "github.com/alexellis/faasd/pkg/cninetwork" - "github.com/alexellis/faasd/pkg/service" + "github.com/openfaas/faasd/pkg/cninetwork" + "github.com/openfaas/faasd/pkg/service" "github.com/containerd/containerd" "github.com/containerd/containerd/namespaces" gocni "github.com/containerd/go-cni" diff --git a/pkg/supervisor.go b/pkg/supervisor.go index 47deb6e..de114f7 100644 --- a/pkg/supervisor.go +++ b/pkg/supervisor.go @@ -8,8 +8,8 @@ import ( "os" "path" - "github.com/alexellis/faasd/pkg/cninetwork" - "github.com/alexellis/faasd/pkg/service" + "github.com/openfaas/faasd/pkg/cninetwork" + "github.com/openfaas/faasd/pkg/service" "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers"