Add AWSVPC setup routines to the attach script

When running in the AWSVPC mode, we need to do the following:

- Keep the HW TX offloading on.
- Check that the allocated address belongs to the default subnet,
  because only one subnet is allowed and it should be the default one.

If it is not possible to determine whether AWSVPC is on, we ignore
all the steps, because the attachment routines have to work
regardless whether the router is running and the AWSVPC detection
is done by querying the /ipinfo/tracker endpoint served by
the router.
This commit is contained in:
Martynas Pumputis authored and Bryan Boreham committed 2016-06-08 16:44:54 +01:00
1 parent de2a70861c
commit 7670fed72c
4 files changed
+51 -7

No files matched your search

+44 -1
View File
@@ -3,12 +3,15 @@ package main
import (
"fmt"
"net"
"os"
"strconv"
"syscall"
docker "github.com/fsouza/go-dockerclient"
"github.com/vishvananda/netns"
"github.com/weaveworks/weave/api"
"github.com/weaveworks/weave/common"
weavenet "github.com/weaveworks/weave/net"
)
@@ -17,11 +20,26 @@ func attach(args []string) error {
cmdUsage("attach-container", "[--no-multicast-route] <container-id> <bridge-name> <mtu> <cidr>...")
}
client := api.NewClient(os.Getenv("WEAVE_HTTP_ADDR"), common.Log)
keepTXOn := false
isAWSVPC := false
// In a case of an error, we skip applying necessary steps for AWSVPC, because
// "attach" should work without the weave router running.
if t, err := client.LocalRangeTracker(); err != nil {
fmt.Fprintf(os.Stderr, "unable to determine tracker: %s; skipping AWSVPC initialization\n", err)
} else if t == "awsvpc" {
isAWSVPC = true
keepTXOn = true
}
withMulticastRoute := true
if args[0] == "--no-multicast-route" {
withMulticastRoute = false
args = args[1:]
}
if isAWSVPC {
withMulticastRoute = false
}
pid, nsContainer, err := containerPidAndNs(args[0])
if err != nil {
@@ -40,7 +58,22 @@ func attach(args []string) error {
if err != nil {
return err
}
err = weavenet.AttachContainer(nsContainer, fmt.Sprint(pid), weavenet.VethName, args[1], mtu, withMulticastRoute, cidrs)
if isAWSVPC {
// Currently, we allow only IP addresses from the default subnet
if defaultSubnet, err := client.DefaultSubnet(); err != nil {
fmt.Fprintf(os.Stderr, "unable to retrieve default subnet: %s; skipping AWSVPC checks\n", err)
} else {
for _, cidr := range cidrs {
if !sameSubnet(cidr, defaultSubnet) {
format := "AWSVPC constraints violation: %s does not belong to the default subnet %s"
return fmt.Errorf(format, cidr, defaultSubnet)
}
}
}
}
err = weavenet.AttachContainer(nsContainer, fmt.Sprint(pid), weavenet.VethName, args[1], mtu, withMulticastRoute, cidrs, keepTXOn)
// If we detected an error but the container has died, tell the user that instead.
if err != nil && !processExists(pid) {
err = fmt.Errorf("Container %s died", args[0])
@@ -48,6 +81,16 @@ func attach(args []string) error {
return err
}
// sameSubnet checks whether ip belongs to network's subnet
func sameSubnet(ip *net.IPNet, network *net.IPNet) bool {
if network.Contains(ip.IP) {
i1, i2 := ip.Mask.Size()
n1, n2 := network.Mask.Size()
return i1 == n1 && i2 == n2
}
return false
}
func containerPidAndNs(containerID string) (int, netns.NsHandle, error) {
c, err := docker.NewVersionedClientFromEnv("1.18")
if err != nil {