pkg/leader/leader.go: use pkg/sdk/log instead of std log/logrus

Author: estroz

pkg/leader/leader.go

@@ -23,7 +23,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/operator-framework/operator-sdk/pkg/sdk/log"
+
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -50,12 +51,12 @@ const PodNameEnv = "POD_NAME"
 // leader. Upon termination of that pod, the garbage collector will delete the
 // ConfigMap, enabling a different pod to become the leader.
 func Become(ctx context.Context, lockName string) error {
-	logrus.Info("trying to become the leader")
+	log.Info("Trying to become the leader.")
 
 	ns, err := myNS()
 	if err != nil {
 		if err == errNoNS {
-			logrus.Info("Skipping leader election; not running in a cluster")
+			log.Info("Skipping leader election; not running in a cluster.")
 			return nil
 		}
 		return err
@@ -90,17 +91,17 @@ func Become(ctx context.Context, lockName string) error {
 	case err == nil:
 		for _, existingOwner := range existing.GetOwnerReferences() {
 			if existingOwner.Name == owner.Name {
-				logrus.Info("Found existing lock with my name. I was likely restarted.")
-				logrus.Info("Continuing as the leader.")
+				log.Info("Found existing lock with my name. I was likely restarted.")
+				log.Info("Continuing as the leader.")
 				return nil
 			} else {
-				logrus.Infof("Found existing lock from %s", existingOwner.Name)
+				log.Infof("Found existing lock", "LockOwner", existingOwner.Name)
 			}
 		}
 	case apierrors.IsNotFound(err):
-		logrus.Info("No pre-existing lock was found.")
+		log.Info("No pre-existing lock was found.")
 	default:
-		logrus.Error("unknown error trying to get ConfigMap")
+		log.Error(err, "unknown error trying to get ConfigMap")
 		return err
 	}
 
@@ -122,10 +123,10 @@ func Become(ctx context.Context, lockName string) error {
 		err := client.Create(ctx, cm)
 		switch {
 		case err == nil:
-			logrus.Info("Became the leader.")
+			log.Info("Became the leader.")
 			return nil
 		case apierrors.IsAlreadyExists(err):
-			logrus.Info("Not the leader. Waiting.")
+			log.Info("Not the leader. Waiting.")
 			select {
 			case <-time.After(wait.Jitter(backoff, .2)):
 				if backoff < maxBackoffInterval {
@@ -136,7 +137,7 @@ func Become(ctx context.Context, lockName string) error {
 				return ctx.Err()
 			}
 		default:
-			logrus.Errorf("unknown error creating configmap: %v", err)
+			log.Error(err, "unknown error creating configmap")
 			return err
 		}
 	}
@@ -147,13 +148,13 @@ func myNS() (string, error) {
 	nsBytes, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
 	if err != nil {
 		if os.IsNotExist(err) {
-			logrus.Debug("current namespace not found")
+			log.V(log.VDebug).Info("current namespace not found")
 			return "", errNoNS
 		}
 		return "", err
 	}
 	ns := strings.TrimSpace(string(nsBytes))
-	logrus.Debugf("found namespace: %s", ns)
+	log.V(log.VDebug).Info("found namespace", "Namespace", ns)
 	return ns, nil
 }
 
@@ -166,7 +167,7 @@ func myOwnerRef(ctx context.Context, client crclient.Client, ns string) (*metav1
 		return nil, fmt.Errorf("required env %s not set, please configure downward API", PodNameEnv)
 	}
 
-	logrus.Debugf("found podname: %s", podName)
+	log.V(log.VDebug).Info("found podname", "PodName", podName)
 
 	myPod := &corev1.Pod{
 		TypeMeta: metav1.TypeMeta{
@@ -178,7 +179,7 @@ func myOwnerRef(ctx context.Context, client crclient.Client, ns string) (*metav1
 	key := crclient.ObjectKey{Namespace: ns, Name: podName}
 	err := client.Get(ctx, key, myPod)
 	if err != nil {
-		logrus.Errorf("failed to get pod: %v", err)
+		log.Errorf(err, "failed to get pod")
 		return nil, err
 	}