Merge pull request #11 from j-fuentes/master

Add ci-test and ci-build and ci-publish targets

Author: jetstack-bot

Makefile

@@ -1,12 +1,12 @@
 ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-VERSION:=$(shell $(ROOT_DIR)/scripts/getversion.sh)
+VERSION:=$(shell $(ROOT_DIR)/hack/getversion)
 COMMIT:=$(shell git rev-list -1 HEAD)
 DATE:=$(shell date -uR)
 GOVERSION:=$(shell go version | awk '{print $$3 " " $$4}')
 
-IMAGE_NAME?=preflight:latest
-OVERLAY?=sample
+DOCKER_IMAGE?=quay.io/jetstack/preflight
+DOCKER_IMAGE_TAG?=$(DOCKER_IMAGE):$(VERSION)
 
 define LDFLAGS
 -X "github.com/jetstack/preflight/cmd.PreflightVersion=$(VERSION)" \
@@ -22,6 +22,11 @@ export GO111MODULE=on
 
 .PHONY: build
 
+clean:
+	cd $(ROOT_DIR) && rm -rf ./builds ./bundles
+
+# Golang cli
+
 build:
 	cd $(ROOT_DIR) && $(GO_BUILD) -o builds/preflight .
 
@@ -34,11 +39,44 @@ vet:
 lint: vet
 	cd $(ROOT_DIR) && golint
 
-clean:
-	cd $(ROOT_DIR) && rm -rf ./builds
+./builds/preflight-$(GOOS)-$(GOARCH):
+	GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o ./builds/preflight-$(GOOS)-$(GOARCH) .
+
+build-all-platforms:
+	$(MAKE) GOOS=linux   GOARCH=amd64 ./builds/preflight-linux-amd64
+	$(MAKE) GOOS=darwin  GOARCH=amd64 ./builds/preflight-darwin-amd64
+	$(MAKE) GOOS=windows GOARCH=amd64 ./builds/preflight-windows-amd64
+
+# Bundles
+
+./bundles/preflight-bundle-$(GOOS)-$(GOARCH).tgz: ./builds/preflight-$(GOOS)-$(GOARCH)
+	cd $(ROOT_DIR) && \
+	mkdir -p ./bundles && \
+	tar --transform "s/assets\/packages/preflight-packages/" -cvf $@.tmp ./preflight-packages/ && \
+  tar --transform "s/examples\/pods.preflight.yaml/preflight.yaml/" -rvf $@.tmp examples/pods.preflight.yaml && \
+  tar --transform "s/builds\/preflight-$(GOOS)-$(GOARCH)/preflight/" -rvf $@.tmp $< && \
+	gzip < $@.tmp > $@ && \
+	rm $@.tmp
+
+bundle-all-platforms:
+	$(MAKE) GOOS=linux   GOARCH=amd64 ./bundles/preflight-bundle-linux-amd64.tgz
+	$(MAKE) GOOS=darwin  GOARCH=amd64 ./bundles/preflight-bundle-darwin-amd64.tgz
+	$(MAKE) GOOS=windows GOARCH=amd64 ./bundles/preflight-bundle-windows-amd64.tgz
+
+# Docker image
 
 build-docker-image:
-	docker build -t $(IMAGE_NAME) .
+	docker build --tag $(DOCKER_IMAGE_TAG) .
 
 push-docker-image:
-	docker push $(IMAGE_NAME)
+	docker tag $(DOCKER_IMAGE_TAG) $(DOCKER_IMAGE):latest
+	docker push $(DOCKER_IMAGE_TAG)
+	docker push $(DOCKER_IMAGE):latest
+
+# CI
+
+ci-test: test lint
+
+ci-build: ci-test build build-docker-image build-all-platforms bundle-all-platforms
+
+ci-publish: ci-build push-docker-image

go.mod

@@ -9,9 +9,11 @@ require (
 	github.com/gookit/color v1.2.0
 	github.com/open-policy-agent/opa v0.15.0
 	github.com/pkg/errors v0.8.1
+	github.com/sergi/go-diff v1.0.0 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.5.0
 	github.com/yudai/gojsondiff v1.0.0
+	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	google.golang.org/api v0.13.0
 	gopkg.in/yaml.v2 v2.2.5

go.sum

@@ -189,6 +189,8 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -226,6 +228,8 @@ github.com/yashtewari/glob-intersection v0.0.0-20180916065949-5c77d914dd0b h1:vV
 github.com/yashtewari/glob-intersection v0.0.0-20180916065949-5c77d914dd0b/go.mod h1:HptNXiXVDcJjXe9SqMd0v2FsL9f8dz4GnXgltU6q/co=
 github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=