Use klog instead of glog and remove useless logs

Author: rahanar

cmd/k8s-ec2-srcdst/main.go

@@ -12,20 +12,19 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/golang/glog"
-	"github.com/ottoyiu/k8s-ec2-srcdst"
+	srcdst "github.com/ottoyiu/k8s-ec2-srcdst"
 	"github.com/ottoyiu/k8s-ec2-srcdst/pkg/common"
 	"github.com/ottoyiu/k8s-ec2-srcdst/pkg/controller"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/klog"
 )
 
 func main() {
 	kubeconfig := flag.String("kubeconfig", "", "Path to a kubeconfig file")
 	numWorkers := flag.Int("numWorkers", 1, "Number of workers to run in the controller")
 	version := flag.Bool("version", false, "Prints current k8s-ec2-srcdst version")
-
-	flag.Set("logtostderr", "true")
 	flag.Parse()
+	klog.InitFlags(nil)
 
 	if *version {
 		fmt.Println(srcdst.Version)
@@ -35,21 +34,21 @@ func main() {
 	// Build the client config - optionally using a provided kubeconfig file.
 	config, err := common.GetClientConfig(*kubeconfig)
 	if err != nil {
-		glog.Fatalf("Failed to load client config: %v", err.Error())
+		klog.Fatalf("Failed to load client config: %v", err.Error())
 	}
 
 	// Construct the Kubernetes client
 	client, err := kubernetes.NewForConfig(config)
 	if err != nil {
-		glog.Fatalf("Failed to create kubernetes client: %v", err.Error())
+		klog.Fatalf("Failed to create kubernetes client: %v", err.Error())
 	}
 
-	glog.Infof("k8s-ec2-srcdst: %v", srcdst.Version)
+	klog.Infof("k8s-ec2-srcdst: %v", srcdst.Version)
 
 	awsConfig := &aws.Config{}
 	awsSession, err := session.NewSession(awsConfig)
 	if err != nil {
-		glog.Fatalf("Failed to create AWS session: %v", err.Error())
+		klog.Fatalf("Failed to create AWS session: %v", err.Error())
 	}
 
 	ec2Client := ec2.New(awsSession, awsConfig)
@@ -64,6 +63,6 @@ func main() {
 	go nodeInformerFactory.Start(stopCh)
 
 	if err = srcDstController.Run(*numWorkers, stopCh); err != nil {
-		glog.Fatalf("Error running controller: %v", err.Error())
+		klog.Fatalf("Error running controller: %v", err.Error())
 	}
 }

go.mod

@@ -44,5 +44,6 @@ require (
 	k8s.io/api v0.0.0-20171207041120-9b9dca205a15
 	k8s.io/apimachinery v0.0.0-20171207040748-5134afd2c0c9
 	k8s.io/client-go v5.0.1+incompatible
+	k8s.io/klog v0.3.3
 	k8s.io/kube-openapi v0.0.0-20171212221656-b16ebc07f5ca // indirect
 )

go.sum

@@ -98,5 +98,7 @@ k8s.io/apimachinery v0.0.0-20171207040748-5134afd2c0c9 h1:1ojpVEFM1iobZ8q5F5x48a
 k8s.io/apimachinery v0.0.0-20171207040748-5134afd2c0c9/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 k8s.io/client-go v5.0.1+incompatible h1:IPZ0cnux5ui8+X8r1HdeFPXucpQ4HyJQigjo1clq1QM=
 k8s.io/client-go v5.0.1+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/klog v0.3.3 h1:niceAagH1tzskmaie/icWd7ci1wbG7Bf2c6YGcQv+3c=
+k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/kube-openapi v0.0.0-20171212221656-b16ebc07f5ca h1:XFgKsNPDJ+n7Z4mi8zxKoqAs+mZZ0PRy+MvhvamzQ/c=
 k8s.io/kube-openapi v0.0.0-20171212221656-b16ebc07f5ca/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=

pkg/controller/srcdst_controller.go

@@ -7,14 +7,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
+	"k8s.io/klog"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	informer "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
@@ -93,11 +93,10 @@ func (c *Controller) processNextWorkItem() bool {
 	if quit {
 		return false
 	}
-	glog.Infof("Get key %s", key.(string))
 
 	defer c.workqueue.Forget(key)
 	if srcDstEnabled, err := c.checkSrcDstAttributeEnabled(key.(string)); err != nil {
-		glog.Error(err)
+		klog.Error(err)
 		c.workqueue.AddRateLimited(key)
 	} else if srcDstEnabled {
 		return true
@@ -116,7 +115,6 @@ func (c *Controller) handler(obj interface{}) {
 	if err != nil {
 		return
 	}
-	glog.Infof("Adding key %s", key)
 	c.workqueue.Add(key)
 	return
 }
@@ -135,19 +133,17 @@ func (c *Controller) disableSrcDstCheck(key string) error {
 		// call AWS ec2 api to disable
 		instanceID, err := GetInstanceIDFromProviderID(nodeCopy.Spec.ProviderID)
 		if err != nil {
-			glog.Errorf("Failed to retrieve Instance ID from Provider ID: %v", nodeCopy.Spec.ProviderID)
+			klog.Errorf("Failed to retrieve Instance ID from Provider ID: %v", nodeCopy.Spec.ProviderID)
 			return err
 		}
 		if err = c.modifySrcDstCheckAttribute(*instanceID); err != nil {
-			glog.Errorf("Failed to disable src dst check for EC2 instance: %v; %v", *instanceID, err)
+			klog.Errorf("Failed to disable src dst check for EC2 instance: %v; %v", *instanceID, err)
 			return err
 		}
 
-		glog.Infof("Marking node %s with SrcDstCheckDisabledAnnotation", nodeCopy.Name)
 		nodeCopy.Annotations[SrcDstCheckDisabledAnnotation] = "true"
-
 		if _, err := c.client.CoreV1().Nodes().Update(nodeCopy); err != nil {
-			glog.Errorf("Failed to set %s annotation: %v", SrcDstCheckDisabledAnnotation, err)
+			klog.Errorf("Failed to set %s annotation: %v", SrcDstCheckDisabledAnnotation, err)
 			return err
 		}
 
@@ -215,7 +211,6 @@ func (c *Controller) checkSrcDstAttributeEnabled(key string) (enabled bool, err
 
 	if nodeObj.Annotations != nil {
 		if _, ok := nodeObj.Annotations[SrcDstCheckDisabledAnnotation]; ok {
-			glog.Info("The node has the annotation")
 			return true, nil
 		}
 	}