add relative duration parsing

- allows unixtimestmaps
- allows relative timestamps (using fortio.org/duration) using creation date

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

README.md

@@ -38,17 +38,26 @@ Help Options:
 
 Supported absolute timestamps
 
-- 2006-01-02 15:04:05 +07:00
-- 2006-01-02 15:04:05 MST
-- 2006-01-02 15:04:05
-- 02 Jan 06 15:04 MST (RFC822)
-- 02 Jan 06 15:04 -0700 (RFC822Z)
-- Monday, 02-Jan-06 15:04:05 MST (RFC850)
-- Mon, 02 Jan 2006 15:04:05 MST (RFC1123)
-- Mon, 02 Jan 2006 15:04:05 -0700 (RFC1123Z)
-- 2006-01-02T15:04:05Z07:00 (RFC3339)
-- 2006-01-02T15:04:05.999999999Z07:00 (RFC3339Nano)
-- 2006-01-02
+- `2006-01-02 15:04:05 +07:00`
+- `2006-01-02 15:04:05 MST`
+- `2006-01-02 15:04:05`
+- `02 Jan 06 15:04 MST` (RFC822)
+- `02 Jan 06 15:04 -0700` (RFC822Z)
+- `Monday, 02-Jan-06 15:04:05 MST` (RFC850)
+- `Mon, 02 Jan 2006 15:04:05 MST` (RFC1123)
+- `Mon, 02 Jan 2006 15:04:05 -0700` (RFC1123Z)
+- `2006-01-02T15:04:05Z07:00` (RFC3339)
+- `2006-01-02T15:04:05.999999999Z07:00` (RFC3339Nano)
+- `2006-01-02`
+
+Supported relative timestamps ([`time.Duration`](https://pkg.go.dev/time) and [`fortio.org/duration`](https://github.com/fortio/duration))
+
+- `1m` (minute)
+- `1h` (hour)
+- `1d` (day)
+- `1d6h` (1 day, 6 hours)
+- `1w` (1 week)
+- `1w2d6h` (1 week, 2 days, 6 hours)
 
 ## Metrics
 

go.mod

@@ -3,6 +3,7 @@ module github.com/webdevops/kube-janitor
 go 1.25.5
 
 require (
+	fortio.org/duration v1.0.4
 	github.com/go-logr/logr v1.4.3
 	github.com/goccy/go-yaml v1.19.0
 	github.com/jessevdk/go-flags v1.6.1

go.sum

@@ -1,3 +1,5 @@
+fortio.org/duration v1.0.4 h1:TB07ng4UsMZPDRujJRkTJIcNqMTLM283zob10nb9K24=
+fortio.org/duration v1.0.4/go.mod h1:RuBVqdcCKRwMmI8WIdVq8kd7ngQPCIe6G7AU0NC0XDw=
 github.com/KimMachineGun/automemlimit v0.7.5 h1:RkbaC0MwhjL1ZuBKunGDjE/ggwAX43DwZrJqVwyveTk=
 github.com/KimMachineGun/automemlimit v0.7.5/go.mod h1:QZxpHaGOQoYvFhv/r4u3U0JTC2ZcOwbSr11UZF46UBM=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

kube_janitor/expiry.go

@@ -2,8 +2,11 @@ package kube_janitor
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
+
+	"fortio.org/duration"
 )
 
 var (
@@ -29,20 +32,36 @@ var (
 	}
 )
 
-func (j *Janitor) checkExpiryDate(value string) (parsedTime *time.Time, expired bool, err error) {
+func (j *Janitor) checkExpiryDate(createdAt time.Time, expiry string) (parsedTime *time.Time, expired bool, err error) {
 	expired = false
 
 	// sanity checks
-	value = strings.TrimSpace(value)
-	if value == "" {
+	expiry = strings.TrimSpace(expiry)
+	if expiry == "" || expiry == "0" {
 		return
 	}
 
+	// parse as unix timestamp
+	if unixTimestamp, err := strconv.ParseInt(expiry, 10, 64); err == nil {
+		expiryTime := time.Unix(unixTimestamp, 0)
+		parsedTime = &expiryTime
+	}
+
+	// parse duration
+	if !createdAt.IsZero() {
+		if expiryDuration, err := duration.Parse(expiry); err == nil && expiryDuration.Seconds() > 1 {
+			expiryTime := createdAt.Add(expiryDuration)
+			parsedTime = &expiryTime
+		}
+	}
+
 	// parse time
-	for _, timeFormat := range janitorTimeFormats {
-		if parseVal, parseErr := time.Parse(timeFormat, value); parseErr == nil && parseVal.Unix() > 0 {
-			parsedTime = &parseVal
-			break
+	if parsedTime == nil {
+		for _, timeFormat := range janitorTimeFormats {
+			if parseVal, parseErr := time.Parse(timeFormat, expiry); parseErr == nil && parseVal.Unix() > 0 {
+				parsedTime = &parseVal
+				break
+			}
 		}
 	}
 
@@ -51,7 +70,7 @@ func (j *Janitor) checkExpiryDate(value string) (parsedTime *time.Time, expired
 		// check if parsed time is before NOW -> expired
 		expired = parsedTime.Before(time.Now())
 	} else {
-		err = fmt.Errorf("unable to parse time '%s'", value)
+		err = fmt.Errorf("unable to parse time '%s'", expiry)
 	}
 
 	return

kube_janitor/manager.go

@@ -155,12 +155,17 @@ func (j *Janitor) Run() error {
 		gvkLogger.Debug("checking resources")
 
 		err := j.kubeEachResource(ctx, resourceType.AsGVR(), func(resource unstructured.Unstructured) error {
-			resourceLogger := gvkLogger.With("namespace", resource.GetNamespace(), "resource", resource.GetName())
 
-			if expiryDate := resource.GetLabels()[j.config.Label]; expiryDate != "" {
-				parsedDate, expired, err := j.checkExpiryDate(expiryDate)
+			if ttl := resource.GetLabels()[j.config.Label]; ttl != "" {
+				resourceLogger := gvkLogger.With(
+					slog.String("namespace", resource.GetNamespace()),
+					slog.String("resource", resource.GetName()),
+					slog.String("ttl", ttl),
+				)
+
+				parsedDate, expired, err := j.checkExpiryDate(resource.GetCreationTimestamp().Time, ttl)
 				if err != nil {
-					resourceLogger.Error("unable to parse expiration date", slog.String("raw", expiryDate), slog.Any("error", err))
+					resourceLogger.Error("unable to parse expiration date", slog.String("raw", ttl), slog.Any("error", err))
 					return nil
 				}
 

tests/configmap.yaml

@@ -11,3 +11,38 @@ metadata:
   name: foo2
   labels:
     ttl: 2026-01-01
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: foo-rel-1m
+  labels:
+    ttl: 1m
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: foo-rel-1d
+  labels:
+    ttl: "1d"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: foo-rel-5d
+  labels:
+    ttl: "5d"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: foo-rel-1d6h
+  labels:
+    ttl: "1d6h"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: foo-invalid
+  labels:
+    ttl: "1237123123"