Merge pull request #42 from nyanpassu/feature/enchance-helper

Feature/enchance helper

.gitignore

@@ -4,6 +4,8 @@ dist
 cert/
 barrel
 eru-barrel
+eru-barrel.debug
+eru-barrel.release
 eru-barrel-utils
 vendor/*
 .mypy_cache

.goreleaser.yml

@@ -8,7 +8,6 @@ builds:
     env:
       - CGO_ENABLED=0
     ldflags:
-      - -s -w
       - -X github.com/projecteru2/barrel/versioninfo.REVISION={{.Commit}}
       - -X github.com/projecteru2/barrel/versioninfo.VERSION={{.Env.VERSION}}
       - -X github.com/projecteru2/barrel/versioninfo.BUILTAT={{.Date}}
@@ -38,6 +37,8 @@ archives:
       windows: Windows
       386: i386
       amd64: x86_64
+    files:
+      - strip_debug.sh
 
 checksum:
   name_template: 'checksums.txt'

Makefile

@@ -1,17 +1,21 @@
-.PHONY: deps build test binary
+.PHONY: deps build test binary mocks
 
 REPO_PATH := github.com/projecteru2/barrel
 REVISION := $(shell git rev-parse HEAD || unknown)
 BUILTAT := $(shell date +%Y-%m-%dT%H:%M:%S)
 BUILD_PATH := target
 VERSION := $(shell git tag --contains $(shell git rev-list --tags --max-count=1) | sed '/-/!{s/$$/_/}' | sort -V -r | sed 's/_$$//' | head -1)
-GO_LDFLAGS ?= -s -X $(REPO_PATH)/versioninfo.REVISION=$(REVISION) \
+GO_LDFLAGS ?= -X $(REPO_PATH)/versioninfo.REVISION=$(REVISION) \
 			  -X $(REPO_PATH)/versioninfo.BUILTAT=$(BUILTAT) \
 			  -X $(REPO_PATH)/versioninfo.VERSION=$(VERSION)
 
-deps:
-	env GO111MODULE=on go mod download
-	env GO111MODULE=on go mod vendor
+binary:
+	go build -ldflags "$(GO_LDFLAGS)" -a -tags "netgo osusergo" -installsuffix netgo -o eru-barrel
+	go build -ldflags "-s -w $(GO_LDFLAGS)" -a -tags "netgo osusergo" -installsuffix netgo -o eru-barrel-utils cmd/ctr/ctr.go
+
+strip: binary
+	objcopy --only-keep-debug eru-barrel eru-barrel.debug
+	objcopy --strip-debug --add-gnu-debuglink=eru-barrel.debug eru-barrel eru-barrel.release
 
 test:
 	go vet `go list ./... | grep -v '/vendor/' | grep -v '/tools'`
@@ -22,14 +26,21 @@ test:
 		./utils/... \
 		./resources/... 
 
-binary:
-	go build -ldflags "$(GO_LDFLAGS)" -a -tags "netgo osusergo" -installsuffix netgo -o eru-barrel
-	go build -ldflags "$(GO_LDFLAGS)" -a -tags "netgo osusergo" -installsuffix netgo -o eru-barrel-utils cmd/ctr/ctr.go
-
 cloc:
 	cloc --exclude-dir=vendor,3rdmocks,mocks,tools --not-match-f=test .
 
 lint:
 	golangci-lint run
 
-build: test binary
+build: test binary
+
+deps:
+	env GO111MODULE=on go mod download
+	env GO111MODULE=on go mod vendor
+
+mocks:
+	cd vessel; \
+	mockery --name FixedIPAllocator && \
+	mockery --name CalicoIPAllocator && \
+	mockery --name ContainerVessel && \
+	mockery --name DockerNetworkManager	

app/app.go

@@ -187,7 +187,7 @@ func (app Application) networkPluginOnlyMode() ([]service.Service, error) {
 	if dockerCli, err = app.getDockerClient(); err != nil {
 		return nil, err
 	}
-	allocator = vessel.NewIPPoolManager(client, dockerCli, app.DriverName, app.Hostname)
+	allocator = vessel.NewCalicoIPAllocator(client, app.Hostname)
 	return []service.Service{
 		pluginService{
 			ipam:   calicoDriver.NewIpam(allocator, app.RequestTimeout),

cmd/ctr/commands/assign/ip.go

@@ -16,8 +16,8 @@ type IPAssign struct {
 	*ctrtypes.Flags
 	c           ctr.Ctr
 	poolFlag    string
-	ipFlag      string
-	hostFlag    string
+	nodeFlag    string
+	ipArg       string
 	fixedIPFlag bool
 }
 
@@ -26,21 +26,23 @@ func IPCommand(flags *ctrtypes.Flags) *cli.Command {
 	assignIP := IPAssign{Flags: flags}
 
 	return &cli.Command{
-		Name:   "ip",
-		Usage:  "assign a ip",
-		Action: assignIP.run,
-		Before: assignIP.init,
+		Name:      "ip",
+		Usage:     "assign a ip",
+		ArgsUsage: "ADDRESSV4",
+		Action:    assignIP.run,
+		Before:    assignIP.init,
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:        "pool",
-				Usage:       "pool",
+				Usage:       "use poolname to specific from which pool to allocate the ip address",
 				Required:    true,
 				Destination: &assignIP.poolFlag,
 			},
 			&cli.StringFlag{
-				Name:        "host",
-				Usage:       "hostname",
-				Destination: &assignIP.hostFlag,
+				Name:        "node",
+				Usage:       "use nodename to specific on which host to allocate the ip address",
+				Required:    true,
+				Destination: &assignIP.nodeFlag,
 			},
 			&cli.BoolFlag{
 				Name:        "fixed-ip",
@@ -52,15 +54,12 @@ func IPCommand(flags *ctrtypes.Flags) *cli.Command {
 }
 
 func (d *IPAssign) init(ctx *cli.Context) error {
-	if err := ctr.InitHost(&d.hostFlag); err != nil {
-		return err
-	}
-	d.ipFlag = ctx.Args().First()
-	if d.ipFlag == "" {
+	d.ipArg = ctx.Args().First()
+	if d.ipArg == "" {
 		return errors.New("must provide ip address")
 	}
 	return ctr.InitCtr(&d.c, func(init *ctr.Init) {
-		init.InitAllocator(d.DockerHostFlag, d.DockerVersionFlag, "")
+		init.InitAllocator(d.nodeFlag)
 	})
 }
 
@@ -76,11 +75,11 @@ func (d *IPAssign) assignIP(ctx context.Context) error {
 	if d.fixedIPFlag {
 		return d.c.AssignFixedIP(ctx, types.IP{
 			PoolID:  d.poolFlag,
-			Address: d.ipFlag,
+			Address: d.ipArg,
 		})
 	}
 	return d.c.AssignIP(ctx, types.IP{
 		PoolID:  d.poolFlag,
-		Address: d.ipFlag,
+		Address: d.ipArg,
 	})
 }

cmd/ctr/commands/diag.go

@@ -15,7 +15,7 @@ func DiagCommands(flags *ctrtypes.Flags) *cli.Command {
 		Subcommands: []*cli.Command{
 			diag.PoolCommand(flags),
 			diag.IPCommand(flags),
-			diag.HostCommand(flags),
+			diag.NodeCommand(flags),
 		},
 	}
 }

cmd/ctr/commands/diag/ip.go

@@ -18,7 +18,7 @@ type DiagnoseIP struct {
 	*ctrtypes.Flags
 	c        ctr.Ctr
 	poolFlag string
-	ip       string
+	ipArg    string
 }
 
 // IPCommand .
@@ -28,12 +28,13 @@ func IPCommand(flags *ctrtypes.Flags) *cli.Command {
 	}
 
 	return &cli.Command{
-		Name:  "ip",
-		Usage: "diagnose ip problem",
+		Name:      "ip",
+		Usage:     "diagnose ip address problem",
+		ArgsUsage: "ADDRESSV4",
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:        "pool",
-				Usage:       "pool",
+				Usage:       "use poolname to specific which pool the address belongs to",
 				Destination: &diagIP.poolFlag,
 				Required:    true,
 			},
@@ -44,8 +45,8 @@ func IPCommand(flags *ctrtypes.Flags) *cli.Command {
 }
 
 func (diag *DiagnoseIP) init(ctx *cli.Context) (err error) {
-	diag.ip = ctx.Args().First()
-	if diag.ip == "" {
+	diag.ipArg = ctx.Args().First()
+	if diag.ipArg == "" {
 		return errors.New("must provide ip address")
 	}
 	return ctr.InitCtr(&diag.c, func(init *ctr.Init) {
@@ -56,14 +57,14 @@ func (diag *DiagnoseIP) init(ctx *cli.Context) (err error) {
 }
 
 func (diag *DiagnoseIP) run(ctx *cli.Context) error {
-	cnetIP := cnet.ParseIP(diag.ip)
+	cnetIP := cnet.ParseIP(diag.ipArg)
 	if cnetIP == nil {
 		return errors.New("arg0 is not a valid ip address")
 	}
 
 	ipInfo, exists, err := diag.c.InspectFixedIP(ctx.Context, types.IP{
 		PoolID:  diag.poolFlag,
-		Address: diag.ip,
+		Address: diag.ipArg,
 	})
 	if err != nil {
 		return err
@@ -96,7 +97,7 @@ func (diag *DiagnoseIP) run(ctx *cli.Context) error {
 	wepAssigned := false
 	for _, wep := range weps {
 		for _, ipNet := range wep.Spec.IPNetworks {
-			if strings.HasPrefix(ipNet, diag.ip) {
+			if strings.HasPrefix(ipNet, diag.ipArg) {
 				wepAssigned = true
 				ctr.Fprintlnf("the ip is assigned to WorkloadEndpoint %s, namespace = %s",
 					wep.Name, wep.Namespace,
@@ -108,13 +109,13 @@ func (diag *DiagnoseIP) run(ctx *cli.Context) error {
 		ctr.Fprintlnf("the ip is not assigned to WorkloadEndpoint")
 	}
 
-	containers, err := diag.c.ListContainerByPool(ctx.Context, diag.poolFlag)
+	containers, err := diag.c.ListContainersByPool(ctx.Context, diag.poolFlag)
 	if err != nil {
 		return errors.Annotate(err, "list containers on subnet error")
 	}
 	occupied := false
 	for containerID, container := range containers {
-		if strings.HasPrefix(container.IPv4Address, diag.ip) {
+		if strings.HasPrefix(container.IPv4Address, diag.ipArg) {
 			occupied = true
 			ctr.Fprintlnf("the ip is occupied by container %s(id = %s), workloadendpointID = %s",
 				container.Name, containerID, container.EndpointID,