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

Commit ca40b1d

Browse files
wlan0wlan0
committed
update api version & glog -> klog
1 parent c357290 commit ca40b1d

File tree

7 files changed

+145
-164
lines changed

7 files changed

+145
-164
lines changed

Diff for: ‎cmd/controller-manager/controller-manager.go

+11-25
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/bucketrequest"
1515
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
1616

17-
"github.com/golang/glog"
17+
"k8s.io/klog/v2"
1818
)
1919

2020
var cmd = &cobra.Command{
@@ -29,34 +29,20 @@ var cmd = &cobra.Command{
2929
}
3030

3131
var kubeConfig string
32+
var verbosity int
3233

3334
func init() {
3435
viper.AutomaticEnv()
3536

36-
cmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
37-
flag.Set("logtostderr", "true")
37+
flag.Set("alsologtostderr", "true")
38+
kflags := flag.NewFlagSet("klog", flag.ExitOnError)
39+
klog.InitFlags(kflags)
3840

39-
strFlag := func(c *cobra.Command, ptr *string, name string, short string, dfault string, desc string) {
40-
c.PersistentFlags().
41-
StringVarP(ptr, name, short, dfault, desc)
42-
}
43-
strFlag(cmd, &kubeConfig, "kubeconfig", "", kubeConfig, "path to kubeconfig file")
44-
45-
hideFlag := func(name string) {
46-
cmd.PersistentFlags().MarkHidden(name)
47-
}
48-
hideFlag("alsologtostderr")
49-
hideFlag("log_backtrace_at")
50-
hideFlag("log_dir")
51-
hideFlag("logtostderr")
52-
hideFlag("master")
53-
hideFlag("stderrthreshold")
54-
hideFlag("vmodule")
41+
cmd.PersistentFlags().AddGoFlagSet(kflags)
42+
cmd.PersistentFlags().StringVarP(&kubeConfig, "kubeconfig", "", kubeConfig, "path to kubeconfig file")
5543

56-
// suppress the incorrect prefix in glog output
57-
flag.CommandLine.Parse([]string{})
44+
//flag.CommandLine.Parse([]string{})
5845
viper.BindPFlags(cmd.PersistentFlags())
59-
6046
}
6147

6248
func main() {
@@ -72,16 +58,16 @@ func main() {
7258
}()
7359

7460
if err := cmd.ExecuteContext(ctx); err != nil {
75-
glog.Fatal(err.Error())
61+
klog.Error(err)
7662
}
7763
}
7864

7965
func run(ctx context.Context, args []string) error {
80-
ctrl, err := bucketcontroller.NewDefaultObjectStorageController("controller-manager", "leader-lock", 40)
66+
ctrl, err := bucketcontroller.NewDefaultObjectStorageController("cosi-controller-manager", "leader-lock", 40)
8167
if err != nil {
8268
return err
8369
}
84-
ctrl.AddBucketRequestListener(bucketrequest.NewListener())
70+
ctrl.AddBucketRequestListener(bucketrequest.NewBucketRequestListener())
8571
ctrl.AddBucketAccessRequestListener(bucketaccessrequest.NewListener())
8672
return ctrl.Run(ctx)
8773
}

Diff for: ‎go.mod

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ module github.com/kubernetes-sigs/container-object-storage-interface-controller
33
go 1.15
44

55
require (
6-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
7-
github.com/golang/protobuf v1.4.3 // indirect
86
github.com/google/go-cmp v0.5.2 // indirect
9-
github.com/google/uuid v1.1.2 // indirect
107
github.com/gopherjs/gopherjs v0.0.0-20190328170749-bb2674552d8f // indirect
118
github.com/kr/text v0.2.0 // indirect
129
github.com/mailru/easyjson v0.7.6 // indirect
@@ -29,8 +26,8 @@ require (
2926
k8s.io/apiextensions-apiserver v0.19.4
3027
k8s.io/apimachinery v0.19.4
3128
k8s.io/client-go v0.19.4
32-
k8s.io/klog/v2 v2.4.0 // indirect
29+
k8s.io/klog/v2 v2.4.0
3330
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
34-
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210225042325-7c26b4fc1ed9
31+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210315005104-5e1814a6aedd
3532
sigs.k8s.io/controller-tools v0.4.1
3633
)

Diff for: ‎go.sum

+17-32
Large diffs are not rendered by default.

Diff for: ‎pkg/bucketaccessrequest/bucketaccessrequest.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset"
1515
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
1616

17-
"github.com/golang/glog"
17+
"k8s.io/klog/v2"
1818
)
1919

2020
type bucketAccessRequestListener struct {
@@ -35,33 +35,33 @@ func (b *bucketAccessRequestListener) InitializeBucketClient(bc bucketclientset.
3535
}
3636

3737
func (b *bucketAccessRequestListener) Add(ctx context.Context, obj *v1alpha1.BucketAccessRequest) error {
38-
glog.V(1).Infof("Add called for BucketAccessRequest %s", obj.Name)
38+
klog.V(1).Infof("Add called for BucketAccessRequest %s", obj.Name)
3939
bucketAccessRequest := obj
4040

4141
err := b.provisionBucketAccess(ctx, bucketAccessRequest)
4242
if err != nil {
4343
// Provisioning is 100% finished / not in progress.
4444
switch err {
4545
case util.ErrBucketAccessAlreadyExists:
46-
glog.V(1).Infof("BucketAccess already exist for this BucketAccessRequest %v.", bucketAccessRequest.Name)
46+
klog.V(1).Infof("BucketAccess already exist for this BucketAccessRequest %v.", bucketAccessRequest.Name)
4747
err = nil
4848
default:
49-
glog.V(1).Infof("Error occurred processing BucketAccessRequest %v: %v", bucketAccessRequest.Name, err)
49+
klog.V(1).Infof("Error occurred processing BucketAccessRequest %v: %v", bucketAccessRequest.Name, err)
5050
}
5151
return err
5252
}
5353

54-
glog.V(1).Infof("BucketAccessRequest %v is successfully processed.", bucketAccessRequest.Name)
54+
klog.V(1).Infof("BucketAccessRequest %v is successfully processed.", bucketAccessRequest.Name)
5555
return nil
5656
}
5757

5858
func (b *bucketAccessRequestListener) Update(ctx context.Context, old, new *v1alpha1.BucketAccessRequest) error {
59-
glog.V(1).Infof("Update called for BucketAccessRequest %v", old.Name)
59+
klog.V(1).Infof("Update called for BucketAccessRequest %v", old.Name)
6060
return nil
6161
}
6262

6363
func (b *bucketAccessRequestListener) Delete(ctx context.Context, obj *v1alpha1.BucketAccessRequest) error {
64-
glog.V(1).Infof("Delete called for BucketAccessRequest %v", obj.Name)
64+
klog.V(1).Infof("Delete called for BucketAccessRequest %v", obj.Name)
6565
return nil
6666
}
6767

@@ -82,7 +82,7 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
8282
if err != nil {
8383
// anything other than 404
8484
if !errors.IsNotFound(err) {
85-
glog.Errorf("error fetching bucketaccess: %v", err)
85+
klog.Errorf("error fetching bucketaccess: %v", err)
8686
return err
8787
}
8888
} else { // if bucket found
@@ -93,7 +93,7 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
9393
bucketAccessClass, err := bacClient.Get(ctx, bucketAccessClassName, metav1.GetOptions{})
9494
if err != nil {
9595
// bucket access class is invalid or not specified, cannot continue with provisioning.
96-
glog.Errorf("error fetching bucketaccessclass [%v]: %v", bucketAccessClassName, err)
96+
klog.Errorf("error fetching bucketaccessclass [%v]: %v", bucketAccessClassName, err)
9797
return util.ErrInvalidBucketAccessClass
9898
}
9999

@@ -104,7 +104,7 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
104104
}
105105
bucketRequest, err := brClient(bucketAccessRequest.Namespace).Get(ctx, brName, metav1.GetOptions{})
106106
if err != nil {
107-
glog.Errorf("error fetching bucket request [%v]: %v", brName, err)
107+
klog.Errorf("error fetching bucket request [%v]: %v", brName, err)
108108
return err
109109
}
110110

@@ -163,7 +163,7 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
163163
if err != nil {
164164
return err
165165
}
166-
glog.Infof("Finished creating BucketAccess %v", bucketaccess.Name)
166+
klog.Infof("Finished creating BucketAccess %v", bucketaccess.Name)
167167
return nil
168168
}
169169

0 commit comments

Comments
 (0)