enable json format everywhere

kubernetes-sigs · Feb 7, 2022 · 4aebce0 · 4aebce0
1 parent 1b1ff26
commit 4aebce0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/bootstrap/kubeadm/main.go b/bootstrap/kubeadm/main.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
+	_ "k8s.io/component-base/logs/json/register"
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -146,7 +147,8 @@ func main() {
 
 	err := logOptions.ValidateAndApply()
 	if err != nil {
-		panic(err)
+		setupLog.Error(err, "unable to start manager")
+		os.Exit(1)
 	}
 
 	ctrl.SetLogger(klogr.NewWithOptions(klogr.WithFormat(klogr.FormatKlog)))

diff --git a/controlplane/kubeadm/main.go b/controlplane/kubeadm/main.go
@@ -36,6 +36,7 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
+	_ "k8s.io/component-base/logs/json/register"
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -149,7 +150,8 @@ func main() {
 
 	err := logOptions.ValidateAndApply()
 	if err != nil {
-		panic(err)
+		setupLog.Error(err, "unable to start manager")
+		os.Exit(1)
 	}
 
 	ctrl.SetLogger(klogr.NewWithOptions(klogr.WithFormat(klogr.FormatKlog)))

diff --git a/internal/controllers/cluster/cluster_controller.go b/internal/controllers/cluster/cluster_controller.go
@@ -99,6 +99,8 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
 	log := ctrl.LoggerFrom(ctx)
 
+	log.Info("abc", "key", "value")
+
 	// Fetch the Cluster instance.
 	cluster := &clusterv1.Cluster{}
 	if err := r.Client.Get(ctx, req.NamespacedName, cluster); err != nil {

diff --git a/main.go b/main.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
-	_ "k8s.io/component-base/logs/json/register" // for JSON log format registration
+	_ "k8s.io/component-base/logs/json/register"
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -189,7 +189,8 @@ func main() {
 
 	err := logOptions.ValidateAndApply()
 	if err != nil {
-		panic(err)
+		setupLog.Error(err, "unable to start manager")
+		os.Exit(1)
 	}
 
 	ctrl.SetLogger(klogr.NewWithOptions(klogr.WithFormat(klogr.FormatKlog)))

diff --git a/test/infrastructure/docker/main.go b/test/infrastructure/docker/main.go
@@ -32,6 +32,7 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
+	_ "k8s.io/component-base/logs/json/register"
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -108,6 +109,7 @@ func initFlags(fs *pflag.FlagSet) {
 func main() {
 	rand.Seed(time.Now().UnixNano())
 	if _, err := os.ReadDir("/tmp/"); err != nil {
+		setupLog.Error(err, "unable to start manager")
 		os.Exit(1)
 	}
 
@@ -118,7 +120,8 @@ func main() {
 
 	err := logOptions.ValidateAndApply()
 	if err != nil {
-		panic(err)
+		setupLog.Error(err, "unable to start manager")
+		os.Exit(1)
 	}
 
 	ctrl.SetLogger(klogr.NewWithOptions(klogr.WithFormat(klogr.FormatKlog)))