uniform log format

charts/values.yaml

@@ -19,7 +19,7 @@ controller:
  image:
  # registry: docker.io
  repository: kubesphere/openelb-controller
- tag: v0.6.0
+ tag: master
  pullPolicy: IfNotPresent
  resources:
  limits:
@@ -57,7 +57,7 @@ speaker:
  image:
  # registry: docker.io
  repository: kubesphere/openelb-speaker
- tag: v0.6.0
+ tag: master
  pullPolicy: IfNotPresent
  resources:
  limits:

cmd/apiserver/app/options/options.go

@@ -1,20 +1,21 @@
 package options
 
 import (
- "github.com/openelb/openelb/pkg/log"
+ "flag"
+ "strings"
+
  server "github.com/openelb/openelb/pkg/server/options"
  cliflag "k8s.io/component-base/cli/flag"
+ "k8s.io/klog/v2"
 )
 
 type OpenELBApiServerOptions struct {
  HTTPOptions *server.Options
- LogOptions *log.Options
 }
 
 func NewOpenELBApiServerOptions() *OpenELBApiServerOptions {
  return &OpenELBApiServerOptions{
  HTTPOptions: server.NewOptions(),
- LogOptions: log.NewOptions(),
  }
 }
 
@@ -25,9 +26,15 @@ func (s *OpenELBApiServerOptions) Validate() []error {
 
 func (s *OpenELBApiServerOptions) Flags() cliflag.NamedFlagSets {
  fss := cliflag.NamedFlagSets{}
-
  s.HTTPOptions.AddFlags(fss.FlagSet("http"))
- s.LogOptions.AddFlags(fss.FlagSet("log"))
+
+ kfs := fss.FlagSet("klog")
+ local := flag.NewFlagSet("klog", flag.ExitOnError)
+ klog.InitFlags(local)
+ local.VisitAll(func(fl *flag.Flag) {
+ fl.Name = strings.Replace(fl.Name, "_", "-", -1)
+ kfs.AddGoFlag(fl)
+ })
 
  return fss
 }

cmd/apiserver/app/server.go

@@ -6,7 +6,6 @@ import (
  "os"
 
  "github.com/openelb/openelb/cmd/apiserver/app/options"
- "github.com/openelb/openelb/pkg/log"
  "github.com/openelb/openelb/pkg/version"
  "github.com/spf13/cobra"
  "github.com/spf13/pflag"
@@ -69,19 +68,12 @@ func NewOpenELBApiServerCommand() *cobra.Command {
 }
 
 func Run(c *options.OpenELBApiServerOptions) error {
- log.InitLog(c.LogOptions)
+ // client, err := client.NewClient(ctrl.GetConfigOrDie())
+ // stopCh := ctrl.SetupSignalHandler()
+ // err = server.SetupHTTPServer(stopCh, client, c.HTTPOptions)
+ // if err != nil {
+ // klog.Fatalf("unable to setup http server: %v", err)
+ // }
 
- //client, err := client.NewClient(ctrl.GetConfigOrDie())
- //
- //setupLog := ctrl.Log.WithName("apiserver")
- //
- //stopCh := ctrl.SetupSignalHandler()
- //
- //err = server.SetupHTTPServer(stopCh, client, c.HTTPOptions)
- //if err != nil {
- // setupLog.Error(err, "unable to setup http server")
- //}
-
- //return err
  return nil
 }

cmd/controller/app/manager.go

@@ -9,7 +9,6 @@ import (
  "github.com/openelb/openelb/cmd/controller/app/options"
  "github.com/openelb/openelb/pkg/controllers/ipam"
  "github.com/openelb/openelb/pkg/controllers/lb"
- "github.com/openelb/openelb/pkg/log"
  "github.com/openelb/openelb/pkg/manager"
  _ "github.com/openelb/openelb/pkg/metrics"
  "github.com/openelb/openelb/pkg/version"
@@ -18,6 +17,7 @@ import (
  utilerrors "k8s.io/apimachinery/pkg/util/errors"
  cliflag "k8s.io/component-base/cli/flag"
  "k8s.io/component-base/term"
+ "k8s.io/klog/v2"
  ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -75,33 +75,27 @@ func NewOpenELBManagerCommand() *cobra.Command {
 }
 
 func Run(c *options.OpenELBManagerOptions) error {
- log.InitLog(c.LogOptions)
- setupLog := ctrl.Log.WithName("manager")
-
+ ctrl.SetLogger(klog.NewKlogr())
  mgr, err := manager.NewManager(ctrl.GetConfigOrDie(), c.GenericOptions)
  if err != nil {
- setupLog.Error(err, "unable to new manager")
- return err
+ klog.Fatalf("unable to new manager: %v", err)
  }
 
  // Setup all Controllers
  err = ipam.SetupWithManager(mgr)
  if err != nil {
- setupLog.Error(err, "unable to setup ipam")
- return err
+ klog.Fatalf("unable to setup ipam: %v", err)
  }
  networkv1alpha2.Eip{}.SetupWebhookWithManager(mgr)
 
  if err = lb.SetupServiceReconciler(mgr); err != nil {
- setupLog.Error(err, "unable to setup lb controller")
- return err
+ klog.Fatalf("unable to setup lb controller: %v", err)
  }
 
  stopCh := ctrl.SetupSignalHandler()
  if err = mgr.Start(stopCh); err != nil {
- setupLog.Error(err, "unable to run the manager")
- return err
+ klog.Fatalf("unable to run the manager: %v", err)
  }
 
- return err
+ return nil
 }

cmd/controller/app/options/options.go

@@ -1,20 +1,21 @@
 package options
 
 import (
- "github.com/openelb/openelb/pkg/log"
+ "flag"
+ "strings"
+
  "github.com/openelb/openelb/pkg/manager"
  cliflag "k8s.io/component-base/cli/flag"
+ "k8s.io/klog/v2"
 )
 
 type OpenELBManagerOptions struct {
  *manager.GenericOptions
- LogOptions *log.Options
 }
 
 func NewOpenELBManagerOptions() *OpenELBManagerOptions {
  return &OpenELBManagerOptions{
  GenericOptions: manager.NewGenericOptions(),
- LogOptions: log.NewOptions(),
  }
 }
 
@@ -25,9 +26,15 @@ func (s *OpenELBManagerOptions) Validate() []error {
 
 func (s *OpenELBManagerOptions) Flags() cliflag.NamedFlagSets {
  fss := cliflag.NamedFlagSets{}
-
  s.GenericOptions.AddFlags(fss.FlagSet("generic"))
- s.LogOptions.AddFlags(fss.FlagSet("log"))
+
+ kfs := fss.FlagSet("klog")
+ local := flag.NewFlagSet("klog", flag.ExitOnError)
+ klog.InitFlags(local)
+ local.VisitAll(func(fl *flag.Flag) {
+ fl.Name = strings.Replace(fl.Name, "_", "-", -1)
+ kfs.AddGoFlag(fl)
+ })
 
  return fss
 }

cmd/speaker/app/options/options.go

@@ -4,7 +4,6 @@ import (
  "flag"
  "strings"
 
- "github.com/openelb/openelb/pkg/log"
  "github.com/openelb/openelb/pkg/speaker/bgp/bgp"
  "github.com/openelb/openelb/pkg/speaker/layer2"
  "github.com/openelb/openelb/pkg/speaker/vip"
@@ -17,7 +16,6 @@ type OpenELBSpeakerOptions struct {
  Bgp *bgp.BgpOptions
  Layer2 *layer2.Options
  Vip *vip.VipOptions
- LogOptions *log.Options
 }
 
 func NewOpenELBSpeakerOptions() *OpenELBSpeakerOptions {
@@ -26,7 +24,6 @@ func NewOpenELBSpeakerOptions() *OpenELBSpeakerOptions {
  Bgp: bgp.NewBgpOptions(),
  Layer2: layer2.NewOptions(),
  Vip: vip.NewVipOptions(),
- LogOptions: log.NewOptions(),
  }
 }
 
@@ -42,7 +39,6 @@ func (s *OpenELBSpeakerOptions) Flags() cliflag.NamedFlagSets {
  s.Bgp.AddFlags(fss.FlagSet("bgp"))
  s.Layer2.AddFlags(fss.FlagSet("layer2"))
  s.Vip.AddFlags(fss.FlagSet("vip"))
- s.LogOptions.AddFlags(fss.FlagSet("log"))
 
  fs := fss.FlagSet("generic")
  fs.StringVar(&s.MetricsAddr, "metrics-addr", s.MetricsAddr, "The address the metric endpoint binds to.")

cmd/speaker/app/speaker.go

@@ -23,15 +23,14 @@ import (
  clientset "k8s.io/client-go/kubernetes"
  cliflag "k8s.io/component-base/cli/flag"
  "k8s.io/component-base/term"
+ "k8s.io/klog/v2"
  ctrl "sigs.k8s.io/controller-runtime"
  "sigs.k8s.io/controller-runtime/pkg/event"
- "sigs.k8s.io/controller-runtime/pkg/log/zap"
  metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 var (
- scheme = runtime.NewScheme()
- setupLog = ctrl.Log.WithName("setup")
+ scheme = runtime.NewScheme()
 )
 
 func init() {
@@ -84,48 +83,42 @@ func NewOpenELBSpeakerCommand() *cobra.Command {
 }
 
 func Run(opt *options.OpenELBSpeakerOptions) error {
- ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opt.LogOptions.Options)))
+ ctrl.SetLogger(klog.NewKlogr())
  mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
  Metrics: metricsserver.Options{
  BindAddress: opt.MetricsAddr,
  },
  Scheme: scheme,
  })
  if err != nil {
- setupLog.Error(err, "unable to new manager")
- return err
+ klog.Fatalf("unable to new manager: %v", err)
  }
 
  spmanager := speaker.NewSpeakerManager(mgr.GetClient(), mgr.GetEventRecorderFor("speakerManager"))
 
  //For gobgp
  bgpServer := bgpd.NewGoBgpd(opt.Bgp)
  if err := bgp.SetupBgpConfReconciler(bgpServer, mgr); err != nil {
- setupLog.Error(err, "unable to setup bgpconf")
- return err
+ klog.Fatalf("unable to setup bgpconf: %v", err)
  }
 
  if err := bgp.SetupBgpPeerReconciler(bgpServer, mgr); err != nil {
- setupLog.Error(err, "unable to setup bgppeer")
- return err
+ klog.Fatalf("unable to setup bgppeer: %v", err)
  }
 
  if err := spmanager.RegisterSpeaker(constant.OpenELBProtocolBGP, bgpServer); err != nil {
- setupLog.Error(err, "unable to register bgp speaker")
- return err
+ klog.Fatalf("unable to register bgp speaker: %v", err)
  }
 
  //For keepalive
  k8sClient := clientset.NewForConfigOrDie(ctrl.GetConfigOrDie())
  if opt.Vip.EnableVIP {
  keepalive, err := vip.NewKeepAlived(k8sClient, opt.Vip.LogPath, opt.Vip.KeepAlivedArgs)
  if err != nil {
- setupLog.Error(err, "unable to new vip speaker")
- return err
+ klog.Fatalf("unable to new vip speaker: %v", err)
  }
  if err := spmanager.RegisterSpeaker(constant.OpenELBProtocolVip, keepalive); err != nil {
- setupLog.Error(err, "unable to register keepalive speaker")
- return err
+ klog.Fatalf("unable to register vip speaker: %v", err)
  }
  }
 
@@ -134,13 +127,11 @@ func Run(opt *options.OpenELBSpeakerOptions) error {
  if opt.Layer2.EnableLayer2 {
  layer2speaker, err := layer2.NewSpeaker(k8sClient, opt.Layer2, reloadChan)
  if err != nil {
- setupLog.Error(err, "unable to new layer2 speaker")
- return err
+ klog.Fatalf("unable to new layer2 speaker: %v", err)
  }
 
  if err := spmanager.RegisterSpeaker(constant.OpenELBProtocolLayer2, layer2speaker); err != nil {
- setupLog.Error(err, "unable to register layer2 speaker")
- return err
+ klog.Fatalf("unable to register layer2 speaker: %v", err)
  }
  }
 
@@ -149,8 +140,7 @@ func Run(opt *options.OpenELBSpeakerOptions) error {
  Client: mgr.GetClient(),
  EventRecorder: mgr.GetEventRecorderFor("lb"),
  }).SetupWithManager(mgr); err != nil {
- setupLog.Error(err, "unable to setup lb")
- return err
+ klog.Fatalf("unable to setup lbcontroller: %v", err)
  }
 
  if err := (&speaker.EIPReconciler{
@@ -160,13 +150,11 @@ func Run(opt *options.OpenELBSpeakerOptions) error {
  Client: mgr.GetClient(),
  EventRecorder: mgr.GetEventRecorderFor("eip"),
  }).SetupWithManager(mgr); err != nil {
- setupLog.Error(err, "unable to setup lb")
- return err
+ klog.Fatalf("unable to setup eipcontroller: %v", err)
  }
 
  if err = mgr.Start(ctrl.SetupSignalHandler()); err != nil {
- setupLog.Error(err, "unable to run the manager")
- return err
+ klog.Fatalf("unable to run the manager: %v", err)
  }
 
  return nil

config/release/manager_image_patch.yaml

@@ -7,7 +7,7 @@ spec:
  spec:
  containers:
  # Change the value of image field below to your controller image URL
- - image: kubesphere/openelb-controller:v0.6.0
+ - image: kubesphere/openelb-controller:master
  name: openelb-controller
  resources:
  limits:

config/release/speaker_image_patch.yaml

@@ -7,7 +7,7 @@ spec:
  spec:
  containers:
  # Change the value of image field below to your controller image URL
- - image: kubesphere/openelb-speaker:v0.6.0
+ - image: kubesphere/openelb-speaker:master
  name: openelb-speaker
  resources:
  limits:

config/workloads/speaker.yaml

@@ -31,7 +31,6 @@ spec:
  - openelb-speaker
  args:
  - --api-hosts=:50051
- - --zap-log-level=info
  - --enable-keepalived-vip=false
  - --enable-layer2=true
  image: speaker:latest

deploy/openelb.yaml

@@ -1132,7 +1132,7 @@ spec:
  valueFrom:
  fieldRef:
  fieldPath: spec.nodeName
- image: kubesphere/openelb-controller:v0.6.0
+ image: kubesphere/openelb-controller:master
  imagePullPolicy: IfNotPresent
  name: openelb-controller
  ports:
@@ -1193,7 +1193,6 @@ spec:
  containers:
  - args:
  - --api-hosts=:50051
- - --zap-log-level=info
  - --enable-keepalived-vip=false
  - --enable-layer2=true
  command:
@@ -1216,7 +1215,7 @@ spec:
  valueFrom:
  fieldRef:
  fieldPath: metadata.name
- image: kubesphere/openelb-speaker:v0.6.0
+ image: kubesphere/openelb-speaker:master
  imagePullPolicy: IfNotPresent
  name: openelb-speaker
  readinessProbe: