update api version & glog -> klog

cmd/controller-manager/controller-manager.go

@@ -14,7 +14,7 @@ import (
 	"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/bucketrequest"
 	bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
 
-	"github.com/golang/glog"
+	"k8s.io/klog/v2"
 )
 
 var cmd = &cobra.Command{
@@ -29,34 +29,20 @@ var cmd = &cobra.Command{
 }
 
 var kubeConfig string
+var verbosity int
 
 func init() {
 	viper.AutomaticEnv()
 
-	cmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
-	flag.Set("logtostderr", "true")
+	flag.Set("alsologtostderr", "true")
+	kflags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(kflags)
 
-	strFlag := func(c *cobra.Command, ptr *string, name string, short string, dfault string, desc string) {
-		c.PersistentFlags().
-			StringVarP(ptr, name, short, dfault, desc)
-	}
-	strFlag(cmd, &kubeConfig, "kubeconfig", "", kubeConfig, "path to kubeconfig file")
-
-	hideFlag := func(name string) {
-		cmd.PersistentFlags().MarkHidden(name)
-	}
-	hideFlag("alsologtostderr")
-	hideFlag("log_backtrace_at")
-	hideFlag("log_dir")
-	hideFlag("logtostderr")
-	hideFlag("master")
-	hideFlag("stderrthreshold")
-	hideFlag("vmodule")
+	cmd.PersistentFlags().AddGoFlagSet(kflags)
+	cmd.PersistentFlags().StringVarP(&kubeConfig, "kubeconfig", "", kubeConfig, "path to kubeconfig file")
 
-	// suppress the incorrect prefix in glog output
-	flag.CommandLine.Parse([]string{})
+	//flag.CommandLine.Parse([]string{})
 	viper.BindPFlags(cmd.PersistentFlags())
-
 }
 
 func main() {
@@ -72,16 +58,16 @@ func main() {
 	}()
 
 	if err := cmd.ExecuteContext(ctx); err != nil {
-		glog.Fatal(err.Error())
+		klog.Error(err)
 	}
 }
 
 func run(ctx context.Context, args []string) error {
-	ctrl, err := bucketcontroller.NewDefaultObjectStorageController("controller-manager", "leader-lock", 40)
+	ctrl, err := bucketcontroller.NewDefaultObjectStorageController("cosi-controller-manager", "leader-lock", 40)
 	if err != nil {
 		return err
 	}
-	ctrl.AddBucketRequestListener(bucketrequest.NewListener())
+	ctrl.AddBucketRequestListener(bucketrequest.NewBucketRequestListener())
 	ctrl.AddBucketAccessRequestListener(bucketaccessrequest.NewListener())
 	return ctrl.Run(ctx)
 }

go.mod

@@ -3,10 +3,7 @@ module github.com/kubernetes-sigs/container-object-storage-interface-controller
 go 1.15
 
 require (
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/google/go-cmp v0.5.2 // indirect
-	github.com/google/uuid v1.1.2 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190328170749-bb2674552d8f // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
@@ -29,8 +26,8 @@ require (
 	k8s.io/apiextensions-apiserver v0.19.4
 	k8s.io/apimachinery v0.19.4
 	k8s.io/client-go v0.19.4
-	k8s.io/klog/v2 v2.4.0 // indirect
+	k8s.io/klog/v2 v2.4.0
 	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
-	sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210225042325-7c26b4fc1ed9
+	sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210315005104-5e1814a6aedd
 	sigs.k8s.io/controller-tools v0.4.1
 )

pkg/bucketaccessrequest/bucketaccessrequest.go

@@ -14,7 +14,7 @@ import (
 	bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset"
 	bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
 
-	"github.com/golang/glog"
+	"k8s.io/klog/v2"
 )
 
 type bucketAccessRequestListener struct {
@@ -35,33 +35,33 @@ func (b *bucketAccessRequestListener) InitializeBucketClient(bc bucketclientset.
 }
 
 func (b *bucketAccessRequestListener) Add(ctx context.Context, obj *v1alpha1.BucketAccessRequest) error {
-	glog.V(1).Infof("Add called for BucketAccessRequest %s", obj.Name)
+	klog.V(1).Infof("Add called for BucketAccessRequest %s", obj.Name)
 	bucketAccessRequest := obj
 
 	err := b.provisionBucketAccess(ctx, bucketAccessRequest)
 	if err != nil {
 		// Provisioning is 100% finished / not in progress.
 		switch err {
 		case util.ErrBucketAccessAlreadyExists:
-			glog.V(1).Infof("BucketAccess already exist for this BucketAccessRequest %v.", bucketAccessRequest.Name)
+			klog.V(1).Infof("BucketAccess already exist for this BucketAccessRequest %v.", bucketAccessRequest.Name)
 			err = nil
 		default:
-			glog.V(1).Infof("Error occurred processing BucketAccessRequest %v: %v", bucketAccessRequest.Name, err)
+			klog.V(1).Infof("Error occurred processing BucketAccessRequest %v: %v", bucketAccessRequest.Name, err)
 		}
 		return err
 	}
 
-	glog.V(1).Infof("BucketAccessRequest %v is successfully processed.", bucketAccessRequest.Name)
+	klog.V(1).Infof("BucketAccessRequest %v is successfully processed.", bucketAccessRequest.Name)
 	return nil
 }
 
 func (b *bucketAccessRequestListener) Update(ctx context.Context, old, new *v1alpha1.BucketAccessRequest) error {
-	glog.V(1).Infof("Update called for BucketAccessRequest %v", old.Name)
+	klog.V(1).Infof("Update called for BucketAccessRequest %v", old.Name)
 	return nil
 }
 
 func (b *bucketAccessRequestListener) Delete(ctx context.Context, obj *v1alpha1.BucketAccessRequest) error {
-	glog.V(1).Infof("Delete called for BucketAccessRequest %v", obj.Name)
+	klog.V(1).Infof("Delete called for BucketAccessRequest %v", obj.Name)
 	return nil
 }
 
@@ -82,7 +82,7 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
 	if err != nil {
 		// anything other than 404
 		if !errors.IsNotFound(err) {
-			glog.Errorf("error fetching bucketaccess: %v", err)
+			klog.Errorf("error fetching bucketaccess: %v", err)
 			return err
 		}
 	} else { // if bucket found
@@ -93,7 +93,7 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
 	bucketAccessClass, err := bacClient.Get(ctx, bucketAccessClassName, metav1.GetOptions{})
 	if err != nil {
 		// bucket access class is invalid or not specified, cannot continue with provisioning.
-		glog.Errorf("error fetching bucketaccessclass [%v]: %v", bucketAccessClassName, err)
+		klog.Errorf("error fetching bucketaccessclass [%v]: %v", bucketAccessClassName, err)
 		return util.ErrInvalidBucketAccessClass
 	}
 
@@ -104,7 +104,7 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
 	}
 	bucketRequest, err := brClient(bucketAccessRequest.Namespace).Get(ctx, brName, metav1.GetOptions{})
 	if err != nil {
-		glog.Errorf("error fetching bucket request [%v]: %v", brName, err)
+		klog.Errorf("error fetching bucket request [%v]: %v", brName, err)
 		return err
 	}
 
@@ -163,7 +163,7 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
 	if err != nil {
 		return err
 	}
-	glog.Infof("Finished creating BucketAccess %v", bucketaccess.Name)
+	klog.Infof("Finished creating BucketAccess %v", bucketaccess.Name)
 	return nil
 }