Feautre/makefile (#10)

* new and improved Makefile that supports Quay.io and remove redundant check

* travis changes

Author: aalubin

.travis.yml

@@ -6,11 +6,11 @@ install:
 - make install_deps
 
 script:
-- make bin/linux/kube-cleanup-operator
-- make bin/darwin/kube-cleanup-operator
+- NAME=GOOS=linux GOARCH=amd64 go build -o bin/kube-cleanup-operator-linux-amd64 ./cmd
+- NAME=GOOS=darwin GOARCH=amd64 go build -o bin/kube-cleanup-operator-darwin-amd64 ./cmd
 - mkdir bin/release
-- mv bin/linux/kube-cleanup-operator bin/release/kube-cleanup-operator-linux
-- mv bin/darwin/kube-cleanup-operator bin/release/kube-cleanup-operator-darwin
+- mv bin/kube-cleanup-operator-linux-amd64 bin/release/kube-cleanup-operator-linux-amd64
+- mv bin/kube-cleanup-operator-darwin-amd64 bin/release/kube-cleanup-operator-darwin-amd64
 
 deploy:
   provider: releases

Dockerfile

@@ -5,6 +5,6 @@ RUN addgroup -S kube-operator && adduser -S -g kube-operator kube-operator
 
 USER kube-operator
 
-COPY bin/linux/kube-cleanup-operator .
+COPY bin/kube-cleanup-operator .
 
 ENTRYPOINT ["./kube-cleanup-operator"]

Makefile

@@ -1,19 +1,66 @@
-OPERATOR_NAME  := kube-cleanup-operator
-VERSION := $(shell date +%Y%m%d%H%M)
-IMAGE := lwolf/$(OPERATOR_NAME)
+NAME:= kube-cleanup-operator
+AUTHOR=lwolf
+VERSION=0.3
+REGISTRY := quay.io
+GIT_SHA=$(shell git --no-pager describe --always --dirty)
+BUILD_TIME=$(shell date '+%s')
+LFLAGS ?= -X main.gitsha=${GIT_SHA} -X main.compiled=${BUILD_TIME}
+ROOT_DIR=${PWD}
+GOVERSION ?= 1.9.2
+HARDWARE=$(shell uname -m)
 
-.PHONY: install_deps build build-image
+.PHONY: authors changelog build docker static release install_deps
+
+default: build
+
+golang:
+	@echo "--> Go Version"
+	@go version
 
 install_deps:
 	dep ensure
 
-build:
-	rm -rf bin/%/$(OPERATOR_NAME)
-	go build -v -i -o bin/$(OPERATOR_NAME) ./cmd
+build: golang
+	@echo "--> Compiling the project"
+	@mkdir -p bin
+	go build -ldflags "${LFLAGS}" -o bin/$(NAME) ./cmd
+
+static: golang 
+	@echo "--> Compiling the static binary"
+	@mkdir -p bin
+	CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -a -tags netgo -ldflags "-w ${LFLAGS}" -o bin/${NAME} ./cmd
+
+docker-build:
+	@echo "--> Compiling the project"
+	docker run --rm \
+		-v ${ROOT_DIR}:/go/src/github.com/${AUTHOR}/${NAME} \
+		-w /go/src/github.com/${AUTHOR}/${NAME} \
+		-e GOOS=linux golang:${GOVERSION} \
+		make static
+
+docker-release:
+	@echo "--> Building a release image"
+	@$(MAKE) static
+	@$(MAKE) docker
+	@docker push ${REGISTRY}/${AUTHOR}/${NAME}:${VERSION}
+
+docker:
+	@echo "--> Building the docker image"
+	docker build -t ${REGISTRY}/${AUTHOR}/${NAME}:${VERSION} .
+
+release: static
+	mkdir -p release
+	gzip -c bin/${NAME} > release/${NAME}_${VERSION}_linux_${HARDWARE}.gz
+	rm -f release/${NAME}
+
+clean:
+	rm -rf ./bin 2>/dev/null
+	rm -rf ./release 2>/dev/null
 
-bin/%/$(OPERATOR_NAME):
-	rm -rf bin/%/$(OPERATOR_NAME)
-	GOOS=$* GOARCH=amd64 go build -v -i -o bin/$*/$(OPERATOR_NAME) ./cmd
+authors:
+	@echo "--> Updating the AUTHORS"
+	git log --format='%aN <%aE>' | sort -u > AUTHORS
 
-build-image: bin/linux/$(OPERATOR_NAME)
-	docker build . -t $(IMAGE):$(VERSION)
+format:
+	@echo "--> Running go fmt"
+	@gofmt -s -w ./

pkg/controller/controller.go

@@ -49,6 +49,7 @@ func NewPodController(kclient *kubernetes.Clientset, opts map[string]string) *Po
 				return kclient.CoreV1().Pods(opts["namespace"]).List(options)
 			},
 			WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
+
 				return kclient.CoreV1().Pods(opts["namespace"]).Watch(options)
 			},
 		},
@@ -97,11 +98,6 @@ func (c *PodController) doTheMagic(cur interface{}, keepSuccessHours int, keepFa
 	if createdMeta.Reference.Kind != "Job" {
 		return
 	}
-	// if restartCount is not 0, do not delete
-	restartCounts := podObj.Status.ContainerStatuses[0].RestartCount
-	if restartCounts != 0 {
-		return
-	}
 
 	executionTimeHours := c.getExecutionTimeHours(podObj)
 	log.Printf("Checking pod %s with %s status that was executed %f hours ago", podObj.Name, podObj.Status.Phase, executionTimeHours)