improve version

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

Author: mblaschke

README.md

@@ -19,6 +19,8 @@ Usage:
   kube-janitor [OPTIONS]
 
 Application Options:
+      --version                                    Show version
+      --version.template=                          Version go template, eg {{.Version}}
       --log.level=[trace|debug|info|warning|error] Log level (default: info) [$LOG_LEVEL]
       --log.format=[logfmt|json]                   Log format (default: logfmt) [$LOG_FORMAT]
       --log.source=[|short|file|full]              Show source for every log message (useful for debugging and bug reports) [$LOG_SOURCE]

common.version.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/webdevops/go-common/version"
+)
+
+var (
+	// Git version information
+	gitCommit = "<unknown>"
+	gitTag    = "<unknown>"
+	buildDate = "<unknown>"
+)
+
+func printStartup(app, author string) {
+	appVersion := version.New(
+		version.WithApp(app),
+		version.WithAuthor(author),
+		version.WithVersion(gitTag),
+		version.WithGitCommit(gitCommit),
+		version.WithBuildDate(buildDate),
+	)
+
+	if Opts.Version.Version {
+		fmt.Println(appVersion.BuildVersionLine(Opts.Version.Template))
+		os.Exit(0)
+	}
+
+	logger.Info(appVersion.Title(nil))
+	logger.Info(string(Opts.GetJson()))
+}

config/opts.go

@@ -7,6 +7,11 @@ import (
 
 type (
 	Opts struct {
+		Version struct {
+			Version  bool    `long:"version" description:"Show version"`
+			Template *string `long:"version.template" description:"Version go template, eg {{.Version}}"`
+		}
+
 		// logger
 		Logger struct {
 			Level  string `long:"log.level"    env:"LOG_LEVEL"   description:"Log level" choice:"trace" choice:"debug" choice:"info" choice:"warning" choice:"error" default:"info"`                          // nolint:staticcheck // multiple choices are ok

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/jmespath-community/go-jmespath v1.1.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/prometheus/client_golang v1.23.2
-	github.com/webdevops/go-common v0.0.0-20251219213826-139615203ee5
+	github.com/webdevops/go-common v0.0.0-20251222130718-713f8c390b81
 	k8s.io/api v0.35.0
 	k8s.io/apimachinery v0.35.0
 	k8s.io/client-go v0.35.0

go.sum

@@ -123,8 +123,8 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/webdevops/go-common v0.0.0-20251219213826-139615203ee5 h1:tWKJuCBPLrmThNw2YFDdh3yx95No75Tev+zgMxJ1RCQ=
-github.com/webdevops/go-common v0.0.0-20251219213826-139615203ee5/go.mod h1:2RZgXC980Lwz2M00Ghm+8/fGY864X7xzXPzFR2RojHc=
+github.com/webdevops/go-common v0.0.0-20251222130718-713f8c390b81 h1:aTQaT6FWdu02ZZl3aaCtWxu6HQA4QsmmU6TqLiTkLd0=
+github.com/webdevops/go-common v0.0.0-20251222130718-713f8c390b81/go.mod h1:FRDcaUKsREtkbLMx1Xoe6DFsTo3FI8PtGBgtJERPGBk=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=

main.go

@@ -6,7 +6,6 @@ import (
 	"log/slog"
 	"net/http"
 	"os"
-	"runtime"
 
 	"github.com/jessevdk/go-flags"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -24,19 +23,14 @@ const (
 var (
 	argparser *flags.Parser
 	Opts      config.Opts
-
-	// Git version information
-	gitCommit = "<unknown>"
-	gitTag    = "<unknown>"
-	buildDate = "<unknown>"
 )
 
 func main() {
 	initArgparser()
 	initLogger()
 
-	logger.Info(fmt.Sprintf("starting kube-janitor v%s (%s; %s; by %v at %v)", gitTag, gitCommit, runtime.Version(), Author, buildDate))
-	logger.Info(string(Opts.GetJson()))
+	printStartup("kube-janitor", Author)
+
 	initSystem()
 
 	janitor := kube_janitor.New()