Skip to content

Commit

Permalink
Rename networking-agent to sand
Browse files Browse the repository at this point in the history
  • Loading branch information
Soulou committed Dec 28, 2017
1 parent 17ab1a1 commit 9a7e781
Show file tree
Hide file tree
Showing 28 changed files with 78 additions and 78 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
@@ -1,8 +1,8 @@
FROM golang:1.9.1

RUN go get github.com/cespare/reflex
ADD . /go/src/github.com/Scalingo/networking-agent
WORKDIR /go/src/github.com/Scalingo/networking-agent
ADD . /go/src/github.com/Scalingo/sand
WORKDIR /go/src/github.com/Scalingo/sand
EXPOSE 9999
RUN go install
CMD /go/bin/networking-agent
CMD /go/bin/sand
4 changes: 2 additions & 2 deletions Vagrantfile
Expand Up @@ -8,7 +8,7 @@ Vagrant.configure("2") do |config|
v.cpus = 2
end

host.vm.synced_folder "./", "/opt/networking-agent"
host.vm.synced_folder "./", "/opt/sand"
host.vm.network "private_network", ip: "192.168.254.2"
end

Expand All @@ -21,7 +21,7 @@ Vagrant.configure("2") do |config|
v.cpus = 2
end

host.vm.synced_folder "./", "/opt/networking-agent"
host.vm.synced_folder "./", "/opt/sand"
host.vm.network "private_network", ip: "192.168.254.3"
end

Expand Down
2 changes: 1 addition & 1 deletion api/params/create_network.go
@@ -1,7 +1,7 @@
package params

import (
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/sand/api/types"
)

type CreateNetworkParams struct {
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-vm1.yml
Expand Up @@ -6,7 +6,7 @@ services:
network_mode: "host"
privileged: true
volumes:
- ./:/go/src/github.com/Scalingo/networking-agent
- ./:/go/src/github.com/Scalingo/sand
- /var/run/netns:/var/run/netns:shared
- /var/run/docker/netns:/var/run/docker/netns:shared
environment:
Expand All @@ -15,7 +15,7 @@ services:
PUBLIC_IP: "192.168.254.2"
ports:
- 9999:9999
command: reflex -r '\.go$$' -s -- sh -c 'go install -race && /go/bin/networking-agent'
command: reflex -r '\.go$$' -s -- sh -c 'go install -race && /go/bin/sand'
etcd:
image: quay.io/coreos/etcd:v3.2.11
command: etcd --name etcd-cluster --listen-peer-urls http://0.0.0.0:2380 --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://192.168.254.2:2379
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-vm2.yml
Expand Up @@ -6,7 +6,7 @@ services:
network_mode: "host"
privileged: true
volumes:
- ./:/go/src/github.com/Scalingo/networking-agent
- ./:/go/src/github.com/Scalingo/sand
- /var/run/netns:/var/run/netns:shared
- /var/run/docker/netns:/var/run/docker/netns:shared
environment:
Expand All @@ -15,4 +15,4 @@ services:
PUBLIC_IP: "192.168.254.3"
ports:
- 9999:9999
command: reflex -r '\.go$$' -s -- sh -c 'go install -race && /go/bin/networking-agent'
command: reflex -r '\.go$$' -s -- sh -c 'go install -race && /go/bin/sand'
6 changes: 3 additions & 3 deletions docker-compose.yml
Expand Up @@ -6,19 +6,19 @@ services:
network_mode: "host"
privileged: true
volumes:
- ./:/go/src/github.com/Scalingo/networking-agent
- ./:/go/src/github.com/Scalingo/sand
- /var/run/netns:/var/run/netns:shared
- /var/run/docker/netns:/var/run/docker/netns:shared
environment:
GO_ENV: development
ETCD_URL: "http://localhost:22379"
ports:
- 9999:9999
command: reflex -r '\.go$$' -s -- sh -c 'go install -race && /go/bin/networking-agent'
command: reflex -r '\.go$$' -s -- sh -c 'go install -race && /go/bin/sand'
test:
build: .
volumes:
- ./:/go/src/github.com/Scalingo/networking-agent
- ./:/go/src/github.com/Scalingo/sand
environment:
GO_ENV: testing
command: "tail -F /dev/null"
Expand Down
8 changes: 4 additions & 4 deletions endpoint/ensure.go
Expand Up @@ -8,10 +8,10 @@ import (

"gopkg.in/errgo.v1"

"github.com/Scalingo/networking-agent/api/params"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/ipallocator"
"github.com/Scalingo/networking-agent/network/overlay"
"github.com/Scalingo/sand/api/params"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/ipallocator"
"github.com/Scalingo/sand/network/overlay"
"github.com/pborman/uuid"
"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions endpoint/exists.go
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/store"
"github.com/pkg/errors"
)

Expand Down
8 changes: 4 additions & 4 deletions endpoint/repository.go
Expand Up @@ -3,10 +3,10 @@ package endpoint
import (
"context"

"github.com/Scalingo/networking-agent/api/params"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/api/params"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/store"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion etcd/client.go
Expand Up @@ -3,7 +3,7 @@ package etcd
import (
"time"

"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/sand/config"
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport"
"github.com/pkg/errors"
Expand Down
6 changes: 3 additions & 3 deletions idmanager/idmanager.go
Expand Up @@ -6,9 +6,9 @@ import (
"sort"

"github.com/Scalingo/go-etcd-lock/lock"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/etcd"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/etcd"
"github.com/Scalingo/sand/store"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions ipallocator/ipallocator.go
Expand Up @@ -6,8 +6,8 @@ import (
"math"
"net"

"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/store"
"github.com/pkg/errors"
"github.com/willf/bitset"
)
Expand Down
16 changes: 8 additions & 8 deletions main.go
Expand Up @@ -9,13 +9,13 @@ import (

"github.com/Scalingo/go-handlers"
"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/endpoint"
"github.com/Scalingo/networking-agent/network"
"github.com/Scalingo/networking-agent/network/overlay"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/networking-agent/web"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/endpoint"
"github.com/Scalingo/sand/network"
"github.com/Scalingo/sand/network/overlay"
"github.com/Scalingo/sand/store"
"github.com/Scalingo/sand/web"
"github.com/docker/docker/pkg/reexec"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
Expand All @@ -27,7 +27,7 @@ func main() {
ctx := logger.ToCtx(context.Background(), log)

// If reexec to create network namespace
if filepath.Base(os.Args[0]) != "networking-agent" {
if filepath.Base(os.Args[0]) != "sand" {
log.WithField("args", os.Args).Info("reexec")
}
ok := reexec.Init()
Expand Down
4 changes: 2 additions & 2 deletions netnsbuilder/create.go
Expand Up @@ -6,8 +6,8 @@ import (
"os/exec"
"syscall"

"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/config"
"github.com/docker/docker/pkg/reexec"
"github.com/pkg/errors"
)
Expand Down
12 changes: 6 additions & 6 deletions network/create.go
Expand Up @@ -8,12 +8,12 @@ import (
"time"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/params"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/ipallocator"
"github.com/Scalingo/networking-agent/network/overlay"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/api/params"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/ipallocator"
"github.com/Scalingo/sand/network/overlay"
"github.com/Scalingo/sand/store"
"github.com/pborman/uuid"
"github.com/pkg/errors"
)
Expand Down
6 changes: 3 additions & 3 deletions network/delete.go
Expand Up @@ -7,9 +7,9 @@ import (
"syscall"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/netnsbuilder"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/netnsbuilder"
"github.com/Scalingo/sand/store"
"github.com/pkg/errors"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
Expand Down
2 changes: 1 addition & 1 deletion network/overlay/endpoint.go
Expand Up @@ -9,7 +9,7 @@ import (
"gopkg.in/errgo.v1"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/sand/api/types"
"github.com/docker/libnetwork/netutils"
"github.com/pkg/errors"
"github.com/vishvananda/netlink"
Expand Down
8 changes: 4 additions & 4 deletions network/overlay/ensure.go
Expand Up @@ -7,10 +7,10 @@ import (
"syscall"
"time"

"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/ipallocator"
"github.com/Scalingo/networking-agent/netnsbuilder"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/ipallocator"
"github.com/Scalingo/sand/netnsbuilder"
"github.com/docker/libnetwork/ns"
"github.com/pkg/errors"
"github.com/vishvananda/netlink"
Expand Down
6 changes: 3 additions & 3 deletions network/overlay/listen.go
Expand Up @@ -8,9 +8,9 @@ import (
"sync"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/store"
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/mvcc/mvccpb"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions network/overlay/neigh.go
Expand Up @@ -7,8 +7,8 @@ import (
"syscall"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/config"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
Expand Down
6 changes: 3 additions & 3 deletions network/overlay/vni_allocator.go
Expand Up @@ -3,9 +3,9 @@ package overlay
import (
"context"

"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/idmanager"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/idmanager"
"github.com/Scalingo/sand/store"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion store/etcd.go
Expand Up @@ -3,7 +3,7 @@ package store
import (
"io"

"github.com/Scalingo/networking-agent/etcd"
"github.com/Scalingo/sand/etcd"
"github.com/coreos/etcd/clientv3"
"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions store/store.go
Expand Up @@ -8,8 +8,8 @@ import (
"reflect"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/etcd"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/etcd"
"github.com/coreos/etcd/clientv3"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
Expand Down
6 changes: 3 additions & 3 deletions web/endpoints_controller.go
@@ -1,9 +1,9 @@
package web

import (
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/network/overlay"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/network/overlay"
"github.com/Scalingo/sand/store"
)

type EndpointsController struct {
Expand Down
6 changes: 3 additions & 3 deletions web/endpoints_controller_create.go
Expand Up @@ -7,9 +7,9 @@ import (
"gopkg.in/errgo.v1"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/params"
"github.com/Scalingo/networking-agent/endpoint"
"github.com/Scalingo/networking-agent/network"
"github.com/Scalingo/sand/api/params"
"github.com/Scalingo/sand/endpoint"
"github.com/Scalingo/sand/network"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
Expand Down
8 changes: 4 additions & 4 deletions web/networks_controller.go
Expand Up @@ -5,10 +5,10 @@ import (
"net/http"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/config"
"github.com/Scalingo/networking-agent/network/overlay"
"github.com/Scalingo/networking-agent/store"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/config"
"github.com/Scalingo/sand/network/overlay"
"github.com/Scalingo/sand/store"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions web/networks_controller_create.go
Expand Up @@ -5,9 +5,9 @@ import (
"net/http"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/api/params"
"github.com/Scalingo/networking-agent/api/types"
"github.com/Scalingo/networking-agent/network"
"github.com/Scalingo/sand/api/params"
"github.com/Scalingo/sand/api/types"
"github.com/Scalingo/sand/network"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion web/networks_controller_delete.go
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"

"github.com/Scalingo/go-internal-tools/logger"
"github.com/Scalingo/networking-agent/network"
"github.com/Scalingo/sand/network"
"github.com/pkg/errors"
)

Expand Down

0 comments on commit 9a7e781

Please sign in to comment.