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

Update API based on latest spec #31

Merged
merged 2 commits into from
Mar 25, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
use klog instead of glog
  • Loading branch information
wlan0 committed Mar 24, 2021
commit a1715041326864e393a371a4bafad29c489328aa
25 changes: 4 additions & 21 deletions controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog/v2"

"github.com/golang/glog"
"github.com/spf13/viper"
)

Expand Down Expand Up @@ -223,14 +223,14 @@ func (c *ObjectStorageController) Run(ctx context.Context) error {
RetryPeriod: c.RetryPeriod,
Callbacks: leaderelection.LeaderCallbacks{
OnStartedLeading: func(ctx context.Context) {
glog.V(2).Info("became leader, starting")
klog.V(2).InfoS("became leader, starting controller")
c.runController(ctx)
},
OnStoppedLeading: func() {
glog.Infof("stopped leading")
klog.InfoS("stopped leading")
},
OnNewLeader: func(identity string) {
glog.V(3).Infof("new leader detected, current leader: %s", identity)
klog.V(3).InfoS("new leader detected", "name", identity)
},
},
}
Expand Down Expand Up @@ -269,36 +269,21 @@ func (c *ObjectStorageController) processNextItem(ctx context.Context) bool {
switch o := op.(type) {
case addOp:
add := *o.AddFunc
objMeta := o.Object.(metav1.Object)
name := objMeta.GetName()
ns := objMeta.GetNamespace()
err = add(ctx, o.Object)
if err == nil {
o.Indexer.Add(o.Object)
} else {
glog.Errorf("Error adding %s %s: %v", ns, name, err)
}
case updateOp:
update := *o.UpdateFunc
objMeta := o.OldObject.(metav1.Object)
name := objMeta.GetName()
ns := objMeta.GetNamespace()
err = update(ctx, o.OldObject, o.NewObject)
if err == nil {
o.Indexer.Update(o.NewObject)
} else {
glog.Errorf("Error updating %s %s: %v", ns, name, err)
}
case deleteOp:
delete := *o.DeleteFunc
objMeta := o.Object.(metav1.Object)
name := objMeta.GetName()
ns := objMeta.GetNamespace()
err = delete(ctx, o.Object)
if err == nil {
o.Indexer.Delete(o.Object)
} else {
glog.Errorf("Error deleting %s %s: %v", ns, name, err)
}
default:
panic("unknown item in queue")
Expand Down Expand Up @@ -425,7 +410,6 @@ func (c *ObjectStorageController) runController(ctx context.Context) {
defer utilruntime.HandleCrash()
defer c.queue.ShutDown()

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

if !cache.WaitForCacheSync(ctx.Done(), ctrlr.HasSynced) {
Expand All @@ -438,7 +422,6 @@ func (c *ObjectStorageController) runController(ctx context.Context) {
}

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

if c.BucketListener != nil {
Expand Down