Feature/v1.9 (#13)

* Add support for K8s 1.9, add support for deletion of pending job getting stuck

.gitignore

@@ -7,9 +7,10 @@ bin/
 .idea/
 # Test binary, build with `go test -c`
 *.test
+*.iml
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
-vendor/
+vendor/

Makefile

@@ -1,6 +1,6 @@
 NAME := kube-cleanup-operator
 AUTHOR=lwolf
-VERSION ?= 0.3
+VERSION ?= 0.4
 REGISTRY ?= quay.io
 GIT_SHA=$(shell git --no-pager describe --always --dirty)
 BUILD_TIME=$(shell date '+%s')

README.md

@@ -40,17 +40,22 @@ Usage of ./bin/kube-cleanup-operator:
   -run-outside-cluster
     	Set this flag when running outside of the cluster.
   -keep-successful
-        the number of days to keep a succesfull job
+        the number of hours to keep a succesfull job
         -1 - forever 
         0  - never (default)
-        >0 - number of days
+        >0 - number of hours
   -keep-failures
-        the number of days to keep a succesfull job
+        the number of hours to keep a succesfull job
         -1 - forever (default)
         0  - never
-        >0 - number of days
+        >0 - number of hours
+  -keep-pending
+        the number of hours to keep a pending job
+        -1 - forever (default)
+        0  - forever
+        >0 - number of hours
   -dry run
         Perform dry run, print only
         
-$ ./bin/kube-cleanup-operator --run-outside-cluster --namespace=default --keep-successful=-1 --keep-failure=0
+$ ./bin/kube-cleanup-operator --run-outside-cluster --namespace=default --keep-successful=0 --keep-failure=-1 --keep-pending=-1
 ```

cmd/main.go

@@ -31,6 +31,7 @@ func main() {
 	namespace := flag.String("namespace", "", "Watch only this namespaces")
 	keepSuccessHours := flag.Int("keep-successful", 0, "Number of hours to keep successful jobs, -1 - forever, 0 - never (default), >0 number of hours")
 	keepFailedHours := flag.Int("keep-failures", -1, "Number of hours to keep faild jobs, -1 - forever (default) 0 - never, >0 number of hours")
+	keepPendingHours := flag.Int("keep-pending", -1, "Number of hours to keep pending jobs, -1 - forever (default) >0 number of hours")
 	dryRun := flag.Bool("dry-run", false, "Print only, do not delete anything.")
 	flag.Parse()
 
@@ -45,6 +46,7 @@ func main() {
 		"namespace":        *namespace,
 		"keepSuccessHours": strconv.Itoa(*keepSuccessHours),
 		"keepFailedHours":  strconv.Itoa(*keepFailedHours),
+		"keepPendingHours": strconv.Itoa(*keepPendingHours),
 		"dryRun":           strconv.FormatBool(*dryRun),
 	}
 	if *dryRun {

pkg/controller/controller.go

@@ -8,6 +8,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/apimachinery/pkg/version"
 	"log"
 	"reflect"
 	"strconv"
@@ -41,7 +42,14 @@ func NewPodController(kclient *kubernetes.Clientset, opts map[string]string) *Po
 
 	keepSuccessHours, _ := strconv.Atoi(opts["keepSuccessHours"])
 	keepFailedHours, _ := strconv.Atoi(opts["keepFailedHours"])
+	keepPendingHours, _ := strconv.Atoi(opts["keepPendingHours"])
 	dryRun, _ := strconv.ParseBool(opts["dryRun"])
+	version, err := kclient.ServerVersion()
+
+	if err != nil{
+		log.Fatalf("Failed to retrieve server version %v", err)
+	}
+
 	// Create informer for watching Namespaces
 	podInformer := cache.NewSharedIndexInformer(
 		&cache.ListWatch{
@@ -59,11 +67,11 @@ func NewPodController(kclient *kubernetes.Clientset, opts map[string]string) *Po
 	)
 	podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: func(cur interface{}) {
-			podWatcher.doTheMagic(cur, keepSuccessHours, keepFailedHours, dryRun)
+			podWatcher.doTheMagic(cur, keepSuccessHours, keepFailedHours, keepPendingHours, dryRun, *version)
 		},
 		UpdateFunc: func(old, cur interface{}) {
 			if !reflect.DeepEqual(old, cur) {
-				podWatcher.doTheMagic(cur, keepSuccessHours, keepFailedHours, dryRun)
+				podWatcher.doTheMagic(cur, keepSuccessHours, keepFailedHours, keepPendingHours, dryRun, *version)
 			}
 		},
 	})
@@ -90,12 +98,13 @@ func (c *PodController) Run(stopCh <-chan struct{}, wg *sync.WaitGroup) {
 	<-stopCh
 }
 
-func (c *PodController) doTheMagic(cur interface{}, keepSuccessHours int, keepFailedHours int, dryRun bool) {
+func (c *PodController) doTheMagic(cur interface{}, keepSuccessHours int, keepFailedHours int, keepPendingHours int, dryRun bool, version version.Info) {
+
 	podObj := cur.(*v1.Pod)
-	// handle jobs only
-	var createdMeta CreatedByAnnotation
-	json.Unmarshal([]byte(podObj.ObjectMeta.Annotations["kubernetes.io/created-by"]), &createdMeta)
-	if createdMeta.Reference.Kind != "Job" {
+	parentJobName := c.getParentJobName(podObj, version)
+	// if we couldn't find a prent job name, ignore this pod
+	if parentJobName == ""{
+		log.Printf("Pod %s was not created by a job, ignoring.", podObj.Name)
 		return
 	}
 
@@ -104,11 +113,15 @@ func (c *PodController) doTheMagic(cur interface{}, keepSuccessHours int, keepFa
 	switch podObj.Status.Phase {
 	case v1.PodSucceeded:
 		if keepSuccessHours == 0 || (keepSuccessHours > 0 && executionTimeHours > float32(keepSuccessHours)) {
-			c.deleteObjects(podObj, createdMeta, dryRun)
+			c.deleteObjects(podObj, parentJobName, dryRun)
 		}
 	case v1.PodFailed:
 		if keepFailedHours == 0 || (keepFailedHours > 0 && executionTimeHours > float32(keepFailedHours)) {
-			c.deleteObjects(podObj, createdMeta, dryRun)
+			c.deleteObjects(podObj, parentJobName, dryRun)
+		}
+	case v1.PodPending:
+		if keepPendingHours > 0 && executionTimeHours > float32(keepPendingHours) {
+			c.deleteObjects(podObj, parentJobName, dryRun)
 		}
 	default:
 		return
@@ -132,7 +145,7 @@ func (c *PodController) getExecutionTimeHours(podObj *v1.Pod) (executionTimeHour
 	return
 }
 
-func (c *PodController) deleteObjects(podObj *v1.Pod, createdMeta CreatedByAnnotation, dryRun bool) {
+func (c *PodController) deleteObjects(podObj *v1.Pod, parentJobName string, dryRun bool) {
 	// Delete Pod
 	if !dryRun {
 		log.Printf("Deleting pod '%s'", podObj.Name)
@@ -143,12 +156,39 @@ func (c *PodController) deleteObjects(podObj *v1.Pod, createdMeta CreatedByAnnot
 	}
 	// Delete Job itself
 	if !dryRun {
-		log.Printf("Deleting job '%s'", createdMeta.Reference.Name)
+		log.Printf("Deleting job '%s'", parentJobName)
 		var jo metav1.DeleteOptions
-		c.kclient.BatchV1Client.Jobs(createdMeta.Reference.Namespace).Delete(createdMeta.Reference.Name, &jo)
+		c.kclient.BatchV1Client.Jobs(podObj.Namespace).Delete(parentJobName, &jo)
 	} else {
-		log.Printf("Job '%s' would have been deleted", createdMeta.Reference.Name)
+		log.Printf("Job '%s' would have been deleted", parentJobName)
 	}
 	return
-
 }
+
+
+func (c *PodController) getParentJobName(podObj *v1.Pod, version version.Info) (parentJobName string) {
+
+	oldVersion := false
+
+	major,_ := strconv.Atoi(version.Major)
+	minor,_ := strconv.Atoi(version.Minor)
+	if major < 2 && minor < 8{
+		oldVersion = true
+	}
+
+	if oldVersion {
+		var createdMeta CreatedByAnnotation
+		json.Unmarshal([]byte(podObj.ObjectMeta.Annotations["kubernetes.io/created-by"]), &createdMeta)
+		if createdMeta.Reference.Kind == "Job" {
+			parentJobName = createdMeta.Reference.Name
+		}
+	}else {
+		// Going all over the owners, looking for a job, usually there is only one owner
+		for _, ow := range podObj.OwnerReferences {
+			if ow.Kind == "Job" {
+				parentJobName = ow.Name
+			}
+		}
+	}
+	return
+}