Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile kops-install default #3426

Merged
merged 2 commits into from
Sep 22, 2017
Merged

Makefile kops-install default #3426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4862f16
Makefile kops-install default
alrs Sep 21, 2017
b98e7f8
Makefile govet depends on ${BINDATA_TARGETS}
alrs Sep 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 28 additions & 21 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@ IMAGES=$(DIST)/images
GOBINDATA=$(LOCAL)/go-bindata
CHANNELS=$(LOCAL)/channels
NODEUP=$(LOCAL)/nodeup
PROTOKUBE=$(LOCAL)/protokube
UPLOAD=$(BUILD)/upload
UID:=$(shell id -u)
GID:=$(shell id -g)
TESTABLE_PACKAGES:=$(cat hack/.packages | egrep -v "k8s.io/kops/cloudmock|k8s.io/kops/vendor")
TESTABLE_PACKAGES:=$(shell egrep -v "k8s.io/kops/cloudmock|k8s.io/kops/vendor" hack/.packages)

SOURCES:=$(shell find . -name "*.go")

# See http://stackoverflow.com/questions/18136918/how-to-get-current-relative-directory-of-your-makefile
MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
Expand Down Expand Up @@ -93,8 +96,21 @@ ifndef SHASUMCMD
$(error "Neither sha1sum nor shasum command is available")
endif

.PHONY: kops-install # Install kops to local $GOPATH/bin
kops-install: ${KOPS}
cp ${KOPS} ${GOPATH_1ST}/bin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is go build still much slower than go install?


.PHONY: channels-install # Install channels to local $GOPATH/bin
channels-install: ${CHANNELS}
cp ${CHANNELS} ${GOPATH_1ST}/bin

.PHONY: all-install # Install all kops project binaries
all-install: all kops-install channels-install
cp ${NODEUP} ${GOPATH_1ST}/bin
cp ${PROTOKUBE} ${GOPATH_1ST}/bin

.PHONY: all
all: kops-dev
all: ${KOPS} ${PROTOKUBE} ${NODEUP} ${CHANNELS}

.PHONY: help
help: # Show this help
Expand Down Expand Up @@ -128,23 +144,12 @@ clean: # Remove build directory and bindata-generated files
for t in ${BINDATA_TARGETS}; do if test -e $$t; then rm -fv $$t; fi; done
if test -e ${BUILD}; then rm -rfv ${BUILD}; fi

.PHONY: install
install: all
cp ${KOPS} ${GOPATH_1ST}/bin
cp ${NODEUP} ${GOPATH_1ST}/bin
cp ${CHANNELS} ${GOPATH_1ST}/bin

.PHONY: kops
kops: kops-dev
kops: ${KOPS}

${KOPS}: ${BINDATA_TARGETS}
${KOPS}: ${BINDATA_TARGETS} ${SOURCES}
go build ${EXTRA_BUILDFLAGS} -ldflags "-X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA} ${EXTRA_LDFLAGS}" -o $@ k8s.io/kops/cmd/kops/

.PHONY: kops-dev
kops-dev: ${BINDATA_TARGETS}
go install ${EXTRA_BUILDFLAGS} -ldflags "-X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA} ${EXTRA_LDFLAGS}" k8s.io/kops/cmd/kops/

.PHONY: ${GOBINDATA}
${GOBINDATA}:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs .PHONY or some deps

mkdir -p ${LOCAL}
go build ${EXTRA_BUILDFLAGS} -ldflags "${EXTRA_LDFLAGS}" -o $@ k8s.io/kops/vendor/github.com/jteeuwen/go-bindata/go-bindata
Expand Down Expand Up @@ -335,9 +340,11 @@ push-gce-run: push
push-aws-run: push
ssh -t ${TARGET} sudo SKIP_PACKAGE_UPDATE=1 /tmp/nodeup --conf=/var/cache/kubernetes-install/kube_env.yaml --v=8

.PHONY: protokube-gocode
protokube-gocode:
go install -tags 'peer_name_alternative peer_name_hash' k8s.io/kops/protokube/cmd/protokube
${PROTOKUBE}: ${SOURCES}
go build -o $@ -tags 'peer_name_alternative peer_name_hash' k8s.io/kops/protokube/cmd/protokube

.PHONY: protokube
protokube: ${PROTOKUBE}

.PHONY: protokube-builder-image
protokube-builder-image:
Expand Down Expand Up @@ -368,7 +375,7 @@ protokube-push: protokube-image
.PHONY: nodeup
nodeup: ${NODEUP}

${NODEUP}: ${BINDATA_TARGETS}
${NODEUP}: ${BINDATA_TARGETS} ${SOURCES}
go build ${EXTRA_BUILDFLAGS} -ldflags "${EXTRA_LDFLAGS} -X k8s.io/kops.Version=${VERSION} -X k8s.io/kops.GitVersion=${GITSHA}" -o $@ k8s.io/kops/cmd/nodeup

.PHONY: nodeup-dist
Expand Down Expand Up @@ -449,7 +456,7 @@ verify-goimports:
hack/verify-goimports

.PHONY: govet
govet:
govet: ${BINDATA_TARGETS}
go vet ${TESTABLE_PACKAGES}

# --------------------------------------------------
Expand Down Expand Up @@ -491,7 +498,7 @@ ci: govet verify-gofmt verify-boilerplate nodeup examples test | verify-gendocs
.PHONY: channels
channels: ${CHANNELS}

${CHANNELS}:
${CHANNELS}: ${SOURCES}
go build ${EXTRA_BUILDFLAGS} -o $@ -ldflags "-X k8s.io/kops.Version=${VERSION} ${EXTRA_LDFLAGS}" k8s.io/kops/channels/cmd/channels

# --------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions images/protokube-builder/onbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ ln -s /src/ /go/src/k8s.io/kops
ls -lR /go/src/k8s.io/kops/protokube/cmd/

cd /go/src/k8s.io/kops/
make protokube-gocode
make protokube

mkdir -p /src/.build/artifacts/
cp /go/bin/protokube /src/.build/artifacts/
cp /src/.build/local/protokube /src/.build/artifacts/

# Applying channels calls out to the channels tool
make channels
Expand Down