feat: Add log level and formatter selector

Author: oxyno-zeta

.vscode/launch.json

@@ -15,7 +15,7 @@
         "AWS_ACCESS_KEY_ID": "${env:AWS_ACCESS_KEY_ID}",
         "AWS_SECRET_ACCESS_KEY": "${env:AWS_SECRET_ACCESS_KEY}"
       },
-      "args": []
+      "args": ["--loglevel=debug"]
     }
   ]
 }

cmd/kubernetes-tagger/config.go

@@ -4,11 +4,16 @@ import (
 	"flag"
 	"os"
 	"path/filepath"
+	"time"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/fsnotify/fsnotify"
 	"github.com/oxyno-zeta/kubernetes-tagger/pkg/kubernetes-tagger/config"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/leaderelection/resourcelock"
+	componentbaseconfig "k8s.io/component-base/config"
 )
 
 // Kubernetes configuration home path
@@ -20,6 +25,8 @@ func configureViper(onChange func(e fsnotify.Event)) {
 	flag.String("namespace", "kube-system", "Namespace where "+projectName+" is deployed")
 	flag.String("kubeconfig", kubeConfigPath, "Kubernetes configuration file path")
 	flag.String("address", ":8085", "The address to expose health and prometheus metrics")
+	flag.String("loglevel", "info", "Log level")
+	flag.String("logformat", "json", "Log format")
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 	pflag.Parse()
 	viper.BindPFlags(pflag.CommandLine)
@@ -33,3 +40,39 @@ func configureViper(onChange func(e fsnotify.Event)) {
 	viper.WatchConfig()
 	viper.OnConfigChange(onChange)
 }
+
+// Default values for leader election
+const (
+	defaultLeaseDuration = 15 * time.Second
+	defaultRenewDeadline = 10 * time.Second
+	defaultRetryPeriod   = 2 * time.Second
+)
+
+func defaultLeaderElectionConfiguration() componentbaseconfig.LeaderElectionConfiguration {
+	return componentbaseconfig.LeaderElectionConfiguration{
+		LeaderElect:   true,
+		LeaseDuration: metav1.Duration{Duration: defaultLeaseDuration},
+		RenewDeadline: metav1.Duration{Duration: defaultRenewDeadline},
+		RetryPeriod:   metav1.Duration{Duration: defaultRetryPeriod},
+		ResourceLock:  resourcelock.EndpointsResourceLock,
+	}
+}
+
+func configureLogger() {
+	// Log level
+	lvl, err := logrus.ParseLevel(context.Configuration.LogLevel)
+	if err != nil {
+		logrus.Fatal(err)
+	}
+	logrus.SetLevel(lvl)
+
+	// Log Formatter
+	switch context.Configuration.LogFormat {
+	case "json":
+		logrus.SetFormatter(&logrus.JSONFormatter{})
+	case "text":
+		logrus.SetFormatter(&logrus.TextFormatter{})
+	default:
+		logrus.Fatalf("Log format not supported: %s", context.Configuration.LogFormat)
+	}
+}

cmd/kubernetes-tagger/kubernetes-tagger.go

@@ -3,7 +3,6 @@ package main
 import (
 	ctx "context"
 	"os"
-	"time"
 
 	"github.com/oxyno-zeta/kubernetes-tagger/pkg/kubernetes-tagger/utils"
 
@@ -17,14 +16,12 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/spf13/viper"
 	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
-	componentbaseconfig "k8s.io/component-base/config"
 
 	kube_record "k8s.io/client-go/tools/record"
 )
@@ -34,23 +31,6 @@ const projectName = "kubernetes-tagger"
 
 var context = &business.Context{}
 
-// Default values for leader election
-const (
-	defaultLeaseDuration = 15 * time.Second
-	defaultRenewDeadline = 10 * time.Second
-	defaultRetryPeriod   = 2 * time.Second
-)
-
-func defaultLeaderElectionConfiguration() componentbaseconfig.LeaderElectionConfiguration {
-	return componentbaseconfig.LeaderElectionConfiguration{
-		LeaderElect:   true,
-		LeaseDuration: metav1.Duration{Duration: defaultLeaseDuration},
-		RenewDeadline: metav1.Duration{Duration: defaultRenewDeadline},
-		RetryPeriod:   metav1.Duration{Duration: defaultRetryPeriod},
-		ResourceLock:  resourcelock.EndpointsResourceLock,
-	}
-}
-
 func main() {
 	// Get Hostname to have unique id for container
 	id, err := os.Hostname()
@@ -68,6 +48,9 @@ func main() {
 
 	readConfiguration()
 
+	// Configure logger
+	configureLogger()
+
 	versionObj := version.GetVersion()
 	logrus.WithFields(logrus.Fields{
 		"build-date": versionObj.BuildDate,

pkg/kubernetes-tagger/config/model.go

@@ -8,6 +8,8 @@ type Configuration struct {
 	Namespace  string        `mapstructure:"namespace"`
 	Kubeconfig string        `mapstructure:"kubeconfig"`
 	Address    string        `mapstructure:"address"`
+	LogLevel   string        `mapstructure:"loglevel"`
+	LogFormat  string        `mapstructure:"logformat"`
 	AWS        *AWSConfig    `mapstructure:"aws"`
 	Rules      []*RuleConfig `mapstructure:"rules"`
 }