Merge pull request #49 from andyz-dev/makefile

[Enhancement] Makefile

Makefile

@@ -32,7 +32,7 @@ PKG_GOLANGCI_LINT := github.com/golangci/golangci-lint/cmd/golangci-lint
 export GO111MODULE=on
 
 # go source files, ignore vendor directory
-SRC = $(shell find . -type f -name '*.go' -not -path "./*/*")
+SRC =  *.go cli/*.go
 
 .PHONY: all build build-cross clean fmt simplify check extra-clean install-tools
 
@@ -53,15 +53,12 @@ extra-clean: clean
 	go clean -i $(PKG_GOLANGCI_LINT)
 
 fmt:
-	@gofmt -l -w $(SRC)
-
-simplify:
 	@gofmt -s -l -w $(SRC)
 
 check:
 	@test -z $(shell gofmt -l main.go | tee /dev/stderr) || echo "[WARN] Fix formatting issues with 'make fmt'"
 	@golangci-lint run
-	@go vet ${SRC}
+	@go vet  main.go
 
 # Check for required executables
 HAS_GOX := $(shell command -v gox 2> /dev/null)

cli/port.go

@@ -19,8 +19,8 @@ const defaultNodes = "server"
 
 // mapping a node role to groups that should be applied to it
 var nodeRuleGroupsMap = map[string][]string{
-	"worker": []string{"all", "workers"},
-	"server": []string{"all", "server", "master"},
+	"worker": {"all", "workers"},
+	"server": {"all", "server", "master"},
 }
 
 // mapNodesToPortSpecs maps nodes to portSpecs

main.go

@@ -23,15 +23,15 @@ func main() {
 	app.Usage = "Run k3s in Docker!"
 	app.Version = version.GetVersion()
 	app.Authors = []cli.Author{
-		cli.Author{
+		{
 			Name:  "Thorsten Klein",
 			Email: "iwilltry42@gmail.com",
 		},
-		cli.Author{
+		{
 			Name:  "Rishabh Gupta",
 			Email: "r.g.gupta@outlook.com",
 		},
-		cli.Author{
+		{
 			Name: "Darren Shepherd",
 		},
 	}