go fmt, update README, more flexible makefile

Author: lwolf

Makefile

@@ -1,7 +1,7 @@
-NAME:= kube-cleanup-operator
+NAME := kube-cleanup-operator
 AUTHOR=lwolf
-VERSION=0.3
-REGISTRY := quay.io
+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}

README.md

@@ -7,7 +7,6 @@ Controller listens for changes in Pods created by Jobs and deletes it on Complet
 Some defaults:
 * All Namespaces are monitored by default
 * Only Pods created by Jobs are monitored
-* Only Pods in Completed state with 0 restarts are deleted
 
 ## Usage
 

cmd/main.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/lwolf/kube-cleanup-operator/pkg/controller"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/clientcmd"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
+	"k8s.io/client-go/tools/clientcmd"
 	"strconv"
 )
 
@@ -42,12 +42,12 @@ func main() {
 	}
 
 	options := map[string]string{
-		"namespace": *namespace,
+		"namespace":        *namespace,
 		"keepSuccessHours": strconv.Itoa(*keepSuccessHours),
-		"keepFailedHours": strconv.Itoa(*keepFailedHours),
-		"dryRun": strconv.FormatBool(*dryRun),
+		"keepFailedHours":  strconv.Itoa(*keepFailedHours),
+		"dryRun":           strconv.FormatBool(*dryRun),
 	}
-	if (*dryRun){
+	if *dryRun {
 		log.Println("Performing dry run...")
 	}
 	log.Printf("Configured namespace: '%s', keepSuccessHours: %d, keepFailedHours: %d", options["namespace"], *keepSuccessHours, *keepFailedHours)
@@ -82,4 +82,4 @@ func newClientSet(runOutsideCluster bool) (*kubernetes.Clientset, error) {
 	}
 
 	return kubernetes.NewForConfig(config)
-}
+}

pkg/controller/controller.go

@@ -10,9 +10,9 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"log"
 	"reflect"
+	"strconv"
 	"sync"
 	"time"
-	"strconv"
 )
 
 // PodController watches the kubernetes api for changes to Pods and
@@ -40,8 +40,8 @@ func NewPodController(kclient *kubernetes.Clientset, opts map[string]string) *Po
 	podWatcher := &PodController{}
 
 	keepSuccessHours, _ := strconv.Atoi(opts["keepSuccessHours"])
-	keepFailedHours, _ 	:= strconv.Atoi(opts["keepFailedHours"])
-	dryRun, _ 			:= strconv.ParseBool(opts["dryRun"])
+	keepFailedHours, _ := strconv.Atoi(opts["keepFailedHours"])
+	dryRun, _ := strconv.ParseBool(opts["dryRun"])
 	// Create informer for watching Namespaces
 	podInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
@@ -101,13 +101,13 @@ func (c *PodController) doTheMagic(cur interface{}, keepSuccessHours int, keepFa
 
 	executionTimeHours := c.getExecutionTimeHours(podObj)
 	log.Printf("Checking pod %s with %s status that was executed %f hours ago", podObj.Name, podObj.Status.Phase, executionTimeHours)
-	switch podObj.Status.Phase{
+	switch podObj.Status.Phase {
 	case v1.PodSucceeded:
-		if keepSuccessHours == 0 || (keepSuccessHours > 0 && executionTimeHours > float32(keepSuccessHours)){
+		if keepSuccessHours == 0 || (keepSuccessHours > 0 && executionTimeHours > float32(keepSuccessHours)) {
 			c.deleteObjects(podObj, createdMeta, dryRun)
 		}
 	case v1.PodFailed:
-		if keepFailedHours == 0 || (keepFailedHours > 0 && executionTimeHours > float32(keepFailedHours)){
+		if keepFailedHours == 0 || (keepFailedHours > 0 && executionTimeHours > float32(keepFailedHours)) {
 			c.deleteObjects(podObj, createdMeta, dryRun)
 		}
 	default:
@@ -116,14 +116,14 @@ func (c *PodController) doTheMagic(cur interface{}, keepSuccessHours int, keepFa
 }
 
 // method to calcualte the hours that passed since the pod's excecution end time
-func (c *PodController) getExecutionTimeHours(podObj *v1.Pod) (executionTimeHours float32){
+func (c *PodController) getExecutionTimeHours(podObj *v1.Pod) (executionTimeHours float32) {
 	executionTimeHours = 0.0
 	currentUnixTime := time.Now().Unix()
 	podConditions := podObj.Status.Conditions
 	var pc v1.PodCondition
-	for _, pc = range podConditions{
+	for _, pc = range podConditions {
 		// Looking for the time when pod's condition "Ready" became "false" (equals end of execution)
-		if pc.Type == v1.PodReady && pc.Status == v1.ConditionFalse{
+		if pc.Type == v1.PodReady && pc.Status == v1.ConditionFalse {
 			executionTimeUnix := pc.LastTransitionTime.Unix()
 			executionTimeHours = (float32(currentUnixTime) - float32(executionTimeUnix)) / float32(3600)
 		}
@@ -138,15 +138,15 @@ func (c *PodController) deleteObjects(podObj *v1.Pod, createdMeta CreatedByAnnot
 		log.Printf("Deleting pod '%s'", podObj.Name)
 		var po metav1.DeleteOptions
 		c.kclient.CoreV1().Pods(podObj.Namespace).Delete(podObj.Name, &po)
-	}else{
+	} else {
 		log.Printf("Pod '%s' would have been deleted", podObj.Name)
 	}
 	// Delete Job itself
 	if !dryRun {
 		log.Printf("Deleting job '%s'", createdMeta.Reference.Name)
 		var jo metav1.DeleteOptions
 		c.kclient.BatchV1Client.Jobs(createdMeta.Reference.Namespace).Delete(createdMeta.Reference.Name, &jo)
-	} else{
+	} else {
 		log.Printf("Job '%s' would have been deleted", createdMeta.Reference.Name)
 	}
 	return