diff --git a/Makefile b/Makefile index cdd60edf4..7c6a16ac9 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ release: \ check \ _output/release/bootkube.tar.gz \ -check: gofmt +check: ifdef TERRAFORM $(TERRAFORM) fmt -check ; if [ ! $$? -eq 0 ]; then exit 1; fi else @@ -35,6 +35,7 @@ else endif @go vet $(shell go list ./... | grep -v '/vendor/') @./scripts/verify-gopkg.sh + @./build/verify-gofmt.sh @go test -v $(shell go list ./... | grep -v '/vendor/\|/e2e') gofmt: diff --git a/build/verify-gofmt.sh b/build/verify-gofmt.sh new file mode 100755 index 000000000..2c43a6a2b --- /dev/null +++ b/build/verify-gofmt.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -euo pipefail + +BOOTKUBE_ROOT=$(git rev-parse --show-toplevel) +sudo rkt run \ + --volume bk,kind=host,source=${BOOTKUBE_ROOT} \ + --mount volume=bk,target=/go/src/github.com/kubernetes-incubator/bootkube \ + --insecure-options=image docker://golang:1.11.1 --exec /bin/bash -- -c \ + "cd /go/src/github.com/kubernetes-incubator/bootkube && make gofmt"