Skip to content

Commit

Permalink
create cmd dir and add kube-controllers
Browse files Browse the repository at this point in the history
also contains makefile changes for file move

Signed-off-by: derek mcquay <derek@tigera.io>
  • Loading branch information
dmmcquay committed Jun 29, 2018
1 parent fe414c7 commit 89743f8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.

0 comments on commit 89743f8

Please sign in to comment.