From 89743f854450f3a6df157ae2aba807fcfe34796f Mon Sep 17 00:00:00 2001 From: derek mcquay Date: Fri, 29 Jun 2018 11:59:37 -0700 Subject: [PATCH] create cmd dir and add kube-controllers also contains makefile changes for file move Signed-off-by: derek mcquay --- Makefile | 6 +++--- main.go => cmd/kube-controllers/main.go | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename main.go => cmd/kube-controllers/main.go (100%) diff --git a/Makefile b/Makefile index e1ebd716..1a3fce1d 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ DOCKER_GO_BUILD := mkdir -p .go-pkg-cache && \ -v $${PWD}/.go-pkg-cache:/go/pkg:rw \ -w /go/src/$(PACKAGE_NAME) \ $(CALICO_BUILD) -SRCFILES=main.go $(shell find pkg -name '*.go') +SRCFILES=cmd/kube-controllers/main.go $(shell find pkg -name '*.go') ## Removes all build artifacts. clean: @@ -114,7 +114,7 @@ bin/kube-controllers-linux-$(ARCH): vendor $(SRCFILES) -e LOCAL_USER_ID=$(LOCAL_USER_ID) \ -v $(CURDIR)/.go-pkg-cache:/go-cache/:rw \ -e GOCACHE=/go-cache \ - $(CALICO_BUILD) go build -v -o bin/kube-controllers-$(OS)-$(ARCH) -ldflags "-X main.VERSION=$(GIT_VERSION)" ./main.go + $(CALICO_BUILD) go build -v -o bin/kube-controllers-$(OS)-$(ARCH) -ldflags "-X main.VERSION=$(GIT_VERSION)" ./cmd/kube-controllers/ ############################################################################### # Building the image @@ -185,7 +185,7 @@ static-checks: vendor check-copyright ## Fix static checks fix goimports: goimports -l -w ./pkg - goimports -l -w ./main.go + goimports -l -w ./cmd/kube-controllers/main.go .PHONY: install-git-hooks ## Install Git hooks diff --git a/main.go b/cmd/kube-controllers/main.go similarity index 100% rename from main.go rename to cmd/kube-controllers/main.go