Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit dbfa38f

Browse files
committed
use klog instead of glog
1 parent 25da025 commit dbfa38f

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

Diff for: controller/controller.go

+4-12
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"k8s.io/client-go/tools/leaderelection/resourcelock"
3131
"k8s.io/client-go/tools/record"
3232
"k8s.io/client-go/util/workqueue"
33+
"k8s.io/klog/v2"
3334

34-
"github.com/golang/glog"
3535
"github.com/spf13/viper"
3636
)
3737

@@ -223,14 +223,14 @@ func (c *ObjectStorageController) Run(ctx context.Context) error {
223223
RetryPeriod: c.RetryPeriod,
224224
Callbacks: leaderelection.LeaderCallbacks{
225225
OnStartedLeading: func(ctx context.Context) {
226-
glog.V(2).Info("became leader, starting")
226+
klog.V(2).InfoS("became leader, starting controller")
227227
c.runController(ctx)
228228
},
229229
OnStoppedLeading: func() {
230-
glog.Infof("stopped leading")
230+
klog.InfoS("stopped leading")
231231
},
232232
OnNewLeader: func(identity string) {
233-
glog.V(3).Infof("new leader detected, current leader: %s", identity)
233+
klog.V(3).InfoS("new leader detected", "name", identity)
234234
},
235235
},
236236
}
@@ -275,8 +275,6 @@ func (c *ObjectStorageController) processNextItem(ctx context.Context) bool {
275275
err = add(ctx, o.Object)
276276
if err == nil {
277277
o.Indexer.Add(o.Object)
278-
} else {
279-
glog.Errorf("Error adding %s %s: %v", ns, name, err)
280278
}
281279
case updateOp:
282280
update := *o.UpdateFunc
@@ -286,8 +284,6 @@ func (c *ObjectStorageController) processNextItem(ctx context.Context) bool {
286284
err = update(ctx, o.OldObject, o.NewObject)
287285
if err == nil {
288286
o.Indexer.Update(o.NewObject)
289-
} else {
290-
glog.Errorf("Error updating %s %s: %v", ns, name, err)
291287
}
292288
case deleteOp:
293289
delete := *o.DeleteFunc
@@ -297,8 +293,6 @@ func (c *ObjectStorageController) processNextItem(ctx context.Context) bool {
297293
err = delete(ctx, o.Object)
298294
if err == nil {
299295
o.Indexer.Delete(o.Object)
300-
} else {
301-
glog.Errorf("Error deleting %s %s: %v", ns, name, err)
302296
}
303297
default:
304298
panic("unknown item in queue")
@@ -425,7 +419,6 @@ func (c *ObjectStorageController) runController(ctx context.Context) {
425419
defer utilruntime.HandleCrash()
426420
defer c.queue.ShutDown()
427421

428-
glog.V(1).Infof("Starting %s controller", name)
429422
go ctrlr.Run(ctx.Done())
430423

431424
if !cache.WaitForCacheSync(ctx.Done(), ctrlr.HasSynced) {
@@ -438,7 +431,6 @@ func (c *ObjectStorageController) runController(ctx context.Context) {
438431
}
439432

440433
<-ctx.Done()
441-
glog.V(3).Infof("Stopping %s controller", name)
442434
}
443435

444436
if c.BucketListener != nil {

0 commit comments

Comments
 (0)