Move from glog to klog

glog is not under development anymore:
https://github.com/kubernetes/klog/blob/master/README.md#why-was-klog-created

Signed-off-by: Manuel Buil <mbuil@suse.com>

Documentation/troubleshooting.md

@@ -9,7 +9,7 @@ This problems manifests itself as connectivity problems between containers runni
 
 
 ## Logging
-Flannel uses the `glog` library but only supports logging to stderr. The severity level can't be changed but the verbosity can be changed with the `-v` option. Flannel does not make extensive use of the verbosity level but increasing the value from `0` (the default) will result in some additional logs. To get the most detailed logs, use `-v=10`
+Flannel uses the `klog` library but only supports logging to stderr. The severity level can't be changed but the verbosity can be changed with the `-v` option. Flannel does not make extensive use of the verbosity level but increasing the value from `0` (the default) will result in some additional logs. To get the most detailed logs, use `-v=10`
 
 ```
 -v value

backend/alivpc/alivpc.go

@@ -18,7 +18,6 @@ package alivpc
 import (
 	"encoding/json"
 	"fmt"
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"os"
 	"sync"
@@ -29,6 +28,7 @@ import (
 	"github.com/denverdino/aliyungo/common"
 	"github.com/denverdino/aliyungo/ecs"
 	"github.com/denverdino/aliyungo/metadata"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/alivpc/alivpc_windows.go

@@ -15,7 +15,7 @@
 package alivpc
 
 import (
-	log "github.com/golang/glog"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/awsvpc/awsvpc.go

@@ -18,19 +18,20 @@ package awsvpc
 import (
 	"encoding/json"
 	"fmt"
+	"net"
+	"sync"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
-	"net"
-	"sync"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
+	log "k8s.io/klog"
 )
 
 func init() {
@@ -60,7 +61,7 @@ func (conf *backendConfig) routeTables() ([]string, error) {
 		return []string{table}, nil
 	}
 	if rawTables, ok := conf.RouteTableID.([]interface{}); ok {
-		log.Info("RouteTableID configured as slice: %+v", rawTables)
+		log.Infof("RouteTableID configured as slice: %+v", rawTables)
 		tables := make([]string, len(rawTables))
 		for idx, t := range rawTables {
 			table, ok := t.(string)
@@ -85,7 +86,7 @@ func (be *AwsVpcBackend) RegisterNetwork(ctx context.Context, wg *sync.WaitGroup
 	var cfg backendConfig
 
 	if len(config.Backend) > 0 {
-		log.Info("Backend configured as: %s", string(config.Backend))
+		log.Infof("Backend configured as: %s", string(config.Backend))
 		if err := json.Unmarshal(config.Backend, &cfg); err != nil {
 			return nil, fmt.Errorf("error decoding VPC backend config: %v", err)
 		}
@@ -200,7 +201,7 @@ func (be *AwsVpcBackend) cleanupBlackholeRoutes(routeTableID string, network ip.
 			if *route.State == "blackhole" && route.DestinationCidrBlock != nil {
 				_, subnet, err := net.ParseCIDR(*route.DestinationCidrBlock)
 				if err == nil && network.Contains(ip.FromIP(subnet.IP)) {
-					log.Info("Removing blackhole route: ", *route.DestinationCidrBlock)
+					log.Infof("Removing blackhole route: ", *route.DestinationCidrBlock)
 					deleteRouteInput := &ec2.DeleteRouteInput{RouteTableId: &routeTableID, DestinationCidrBlock: route.DestinationCidrBlock}
 					if _, err := ec2c.DeleteRoute(deleteRouteInput); err != nil {
 						if ec2err, ok := err.(awserr.Error); !ok || ec2err.Code() != "InvalidRoute.NotFound" {
@@ -298,7 +299,7 @@ func (be *AwsVpcBackend) detectRouteTableID(eni *ec2.InstanceNetworkInterface, e
 
 	res, err = ec2c.DescribeRouteTables(routeTablesInput)
 	if err != nil {
-		log.Info("error describing route tables: ", err)
+		log.Infof("error describing route tables: ", err)
 	}
 
 	if len(res.RouteTables) == 0 {

backend/awsvpc/awsvpc_windows.go

@@ -15,7 +15,7 @@
 package awsvpc
 
 import (
-	log "github.com/golang/glog"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/extension/extension.go

@@ -23,12 +23,11 @@ import (
 	"os/exec"
 	"sync"
 
-	log "github.com/golang/glog"
-
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
 	"golang.org/x/net/context"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/extension/extension_network.go

@@ -18,13 +18,13 @@ import (
 	"encoding/json"
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"fmt"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"
+	log "k8s.io/klog"
 )
 
 type network struct {

backend/gce/api.go

@@ -19,11 +19,10 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/golang/glog"
-
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/compute/v1"
+	log "k8s.io/klog"
 )
 
 type gceAPI struct {

backend/gce/gce.go

@@ -40,15 +40,15 @@ package gce
 
 import (
 	"fmt"
-	log "github.com/golang/glog"
-	"golang.org/x/net/context"
-	"google.golang.org/api/googleapi"
 	"strings"
 	"sync"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
+	"golang.org/x/net/context"
+	"google.golang.org/api/googleapi"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/gce/gce_windows.go

@@ -38,7 +38,7 @@
 package gce
 
 import (
-	log "github.com/golang/glog"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/hostgw/hostgw_windows.go

@@ -21,16 +21,15 @@ import (
 	"time"
 
 	"github.com/Microsoft/hcsshim"
-	log "github.com/golang/glog"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-	"k8s.io/apimachinery/pkg/util/json"
-	"k8s.io/apimachinery/pkg/util/wait"
-
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/pkg/routing"
 	"github.com/coreos/flannel/subnet"
+	"github.com/pkg/errors"
+	"golang.org/x/net/context"
+	"k8s.io/apimachinery/pkg/util/json"
+	"k8s.io/apimachinery/pkg/util/wait"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/ipip/ipip.go

@@ -19,16 +19,15 @@ package ipip
 import (
 	"encoding/json"
 	"fmt"
-	"syscall"
-
 	"sync"
+	"syscall"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
-	log "github.com/golang/glog"
 	"github.com/vishvananda/netlink"
 	"golang.org/x/net/context"
+	log "k8s.io/klog"
 )
 
 const (

backend/ipip/ipip_windows.go

@@ -16,7 +16,7 @@
 package ipip
 
 import (
-	log "github.com/golang/glog"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/ipsec/handle_charon.go

@@ -27,8 +27,8 @@ import (
 
 	"github.com/bronze1man/goStrongswanVici"
 	"github.com/coreos/flannel/subnet"
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
+	log "k8s.io/klog"
 )
 
 type Uri struct {

backend/ipsec/handle_xfrm.go

@@ -21,10 +21,9 @@ import (
 	"net"
 	"syscall"
 
-	log "github.com/golang/glog"
-	"github.com/vishvananda/netlink"
-
 	"github.com/coreos/flannel/subnet"
+	"github.com/vishvananda/netlink"
+	log "k8s.io/klog"
 )
 
 func AddXFRMPolicy(myLease, remoteLease *subnet.Lease, dir netlink.Dir, reqID int) error {

backend/ipsec/ipsec.go

@@ -20,12 +20,12 @@ import (
 	"fmt"
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
+	log "k8s.io/klog"
 )
 
 /*

backend/ipsec/ipsec_network.go

@@ -21,12 +21,11 @@ import (
 	"strconv"
 	"sync"
 
-	log "github.com/golang/glog"
-	"github.com/vishvananda/netlink"
-	"golang.org/x/net/context"
-
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
+	log "k8s.io/klog"
 )
 
 const (

backend/ipsec/ipsec_windows.go

@@ -14,7 +14,7 @@
 
 package ipsec
 
-import log "github.com/golang/glog"
+import log "k8s.io/klog"
 
 func init() {
 	log.Infof("ipsec is not supported on this platform")

backend/route_network.go

@@ -22,11 +22,11 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 	"github.com/vishvananda/netlink"
+	log "k8s.io/klog"
 )
 
 const (

backend/route_network_windows.go

@@ -15,15 +15,15 @@
 package backend
 
 import (
+	"strings"
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/routing"
 	"github.com/coreos/flannel/subnet"
-	"strings"
+	log "k8s.io/klog"
 )
 
 const (

backend/udp/cproxy_amd64.go

@@ -24,9 +24,8 @@ import (
 	"reflect"
 	"unsafe"
 
-	log "github.com/golang/glog"
-
 	"github.com/coreos/flannel/pkg/ip"
+	log "k8s.io/klog"
 )
 
 func runCProxy(tun *os.File, conn *net.UDPConn, ctl *os.File, tunIP ip.IP4, tunMTU int) {

backend/udp/udp_network_amd64.go

@@ -24,13 +24,13 @@ import (
 	"sync"
 	"syscall"
 
-	log "github.com/golang/glog"
-	"github.com/vishvananda/netlink"
 	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
+	"github.com/vishvananda/netlink"
+	log "k8s.io/klog"
 )
 
 const (

backend/udp/udp_windows.go

@@ -15,7 +15,7 @@
 package udp
 
 import (
-	log "github.com/golang/glog"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/vxlan/device.go

@@ -22,11 +22,10 @@ import (
 	"net"
 	"syscall"
 
-	log "github.com/golang/glog"
-	"github.com/vishvananda/netlink"
-
 	"github.com/containernetworking/plugins/pkg/utils/sysctl"
 	"github.com/coreos/flannel/pkg/ip"
+	"github.com/vishvananda/netlink"
+	log "k8s.io/klog"
 )
 
 type vxlanDeviceAttrs struct {

backend/vxlan/device_windows.go

@@ -21,9 +21,9 @@ import (
 
 	"github.com/Microsoft/hcsshim/hcn"
 	"github.com/coreos/flannel/pkg/ip"
-	log "github.com/golang/glog"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
+	log "k8s.io/klog"
 )
 
 type vxlanDeviceAttrs struct {

backend/vxlan/vxlan.go

@@ -55,7 +55,6 @@ package vxlan
 import (
 	"encoding/json"
 	"fmt"
-	log "github.com/golang/glog"
 	"net"
 	"sync"
 
@@ -64,6 +63,7 @@ import (
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
+	log "k8s.io/klog"
 )
 
 func init() {

backend/vxlan/vxlan_network.go

@@ -19,16 +19,15 @@ import (
 	"encoding/json"
 	"net"
 	"sync"
+	"syscall"
 
-	log "github.com/golang/glog"
-	"github.com/vishvananda/netlink"
 	"golang.org/x/net/context"
 
-	"syscall"
-
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
+	"github.com/vishvananda/netlink"
+	log "k8s.io/klog"
 )
 
 type network struct {

backend/vxlan/vxlan_network_windows.go

@@ -15,18 +15,18 @@
 package vxlan
 
 import (
-	log "github.com/golang/glog"
-	"golang.org/x/net/context"
+	"encoding/json"
+	"net"
+	"strings"
 	"sync"
 
-	"github.com/coreos/flannel/backend"
-	"github.com/coreos/flannel/subnet"
+	"golang.org/x/net/context"
 
-	"encoding/json"
 	"github.com/Microsoft/hcsshim/hcn"
+	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
-	"net"
-	"strings"
+	"github.com/coreos/flannel/subnet"
+	log "k8s.io/klog"
 )
 
 type network struct {

backend/vxlan/vxlan_windows.go

@@ -27,17 +27,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net"
 	"sync"
 
-	log "github.com/golang/glog"
-
 	"golang.org/x/net/context"
 
 	"github.com/Microsoft/hcsshim/hcn"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
-	"net"
+	log "k8s.io/klog"
 )
 
 func init() {

main.go

@@ -26,10 +26,11 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
 	"syscall"
+	"time"
 
 	"github.com/coreos/pkg/flagutil"
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/network"
@@ -38,13 +39,10 @@ import (
 	"github.com/coreos/flannel/subnet/etcdv2"
 	"github.com/coreos/flannel/subnet/kube"
 	"github.com/coreos/flannel/version"
-
-	"time"
+	log "k8s.io/klog"
 
 	"github.com/joho/godotenv"
 
-	"sync"
-
 	// Backends need to be imported for their init() to get executed and them to register
 	"github.com/coreos/flannel/backend"
 	_ "github.com/coreos/flannel/backend/alivpc"
@@ -133,11 +131,13 @@ func init() {
 	flannelFlags.BoolVar(&opts.iptablesForwardRules, "iptables-forward-rules", true, "add default accept rules to FORWARD chain in iptables")
 	flannelFlags.StringVar(&opts.netConfPath, "net-config-path", "/etc/kube-flannel/net-conf.json", "path to the network configuration file")
 
-	// glog will log to tmp files by default. override so all entries
+	log.InitFlags(nil)
+
+	// klog will log to tmp files by default. override so all entries
 	// can flow into journald (if running under systemd)
 	flag.Set("logtostderr", "true")
 
-	// Only copy the non file logging options from glog
+	// Only copy the non file logging options from klog
 	copyFlag("v")
 	copyFlag("vmodule")
 	copyFlag("log_backtrace_at")

network/iptables.go

@@ -18,14 +18,12 @@ package network
 import (
 	"fmt"
 	"strings"
-
-	log "github.com/golang/glog"
-
 	"time"
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
 	"github.com/coreos/go-iptables/iptables"
+	log "k8s.io/klog"
 )
 
 type IPTables interface {

subnet/etcdv2/local_manager.go

@@ -23,8 +23,8 @@ import (
 	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/flannel/pkg/ip"
 	. "github.com/coreos/flannel/subnet"
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
+	log "k8s.io/klog"
 )
 
 const (

subnet/etcdv2/registry.go

@@ -25,11 +25,10 @@ import (
 
 	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/pkg/transport"
-	log "github.com/golang/glog"
-	"golang.org/x/net/context"
-
 	"github.com/coreos/flannel/pkg/ip"
 	. "github.com/coreos/flannel/subnet"
+	"golang.org/x/net/context"
+	log "k8s.io/klog"
 )
 
 var (

subnet/kube/kube.go

@@ -25,7 +25,6 @@ import (
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"
-	"github.com/golang/glog"
 	"golang.org/x/net/context"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +38,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
+	log "k8s.io/klog"
 )
 
 var (
@@ -113,14 +113,14 @@ func NewSubnetManager(ctx context.Context, apiUrl, kubeconfig, prefix, netConfPa
 	}
 	go sm.Run(context.Background())
 
-	glog.Infof("Waiting %s for node controller to sync", nodeControllerSyncTimeout)
+	log.Infof("Waiting %s for node controller to sync", nodeControllerSyncTimeout)
 	err = wait.Poll(time.Second, nodeControllerSyncTimeout, func() (bool, error) {
 		return sm.nodeController.HasSynced(), nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("error waiting for nodeController to sync state: %v", err)
 	}
-	glog.Infof("Node controller sync successful")
+	log.Infof("Node controller sync successful")
 
 	return sm, nil
 }
@@ -158,12 +158,12 @@ func newKubeSubnetManager(ctx context.Context, c clientset.Interface, sc *subnet
 				if !isNode {
 					deletedState, ok := obj.(cache.DeletedFinalStateUnknown)
 					if !ok {
-						glog.Infof("Error received unexpected object: %v", obj)
+						log.Infof("Error received unexpected object: %v", obj)
 						return
 					}
 					node, ok = deletedState.Obj.(*v1.Node)
 					if !ok {
-						glog.Infof("Error deletedFinalStateUnknown contained non-Node object: %v", deletedState.Obj)
+						log.Infof("Error deletedFinalStateUnknown contained non-Node object: %v", deletedState.Obj)
 						return
 					}
 					obj = node
@@ -186,7 +186,7 @@ func (ksm *kubeSubnetManager) handleAddLeaseEvent(et subnet.EventType, obj inter
 
 	l, err := ksm.nodeToLease(*n)
 	if err != nil {
-		glog.Infof("Error turning node %q to lease: %v", n.ObjectMeta.Name, err)
+		log.Infof("Error turning node %q to lease: %v", n.ObjectMeta.Name, err)
 		return
 	}
 	ksm.events <- subnet.Event{et, l}
@@ -206,7 +206,7 @@ func (ksm *kubeSubnetManager) handleUpdateLeaseEvent(oldObj, newObj interface{})
 
 	l, err := ksm.nodeToLease(*n)
 	if err != nil {
-		glog.Infof("Error turning node %q to lease: %v", n.ObjectMeta.Name, err)
+		log.Infof("Error turning node %q to lease: %v", n.ObjectMeta.Name, err)
 		return
 	}
 	ksm.events <- subnet.Event{subnet.EventAdded, l}
@@ -243,7 +243,7 @@ func (ksm *kubeSubnetManager) AcquireLease(ctx context.Context, attrs *subnet.Le
 		n.Annotations[ksm.annotations.BackendData] = string(bd)
 		if n.Annotations[ksm.annotations.BackendPublicIPOverwrite] != "" {
 			if n.Annotations[ksm.annotations.BackendPublicIP] != n.Annotations[ksm.annotations.BackendPublicIPOverwrite] {
-				glog.Infof("Overriding public ip with '%s' from node annotation '%s'",
+				log.Infof("Overriding public ip with '%s' from node annotation '%s'",
 					n.Annotations[ksm.annotations.BackendPublicIPOverwrite],
 					ksm.annotations.BackendPublicIPOverwrite)
 				n.Annotations[ksm.annotations.BackendPublicIP] = n.Annotations[ksm.annotations.BackendPublicIPOverwrite]
@@ -275,7 +275,7 @@ func (ksm *kubeSubnetManager) AcquireLease(ctx context.Context, attrs *subnet.Le
 	}
 	err = ksm.setNodeNetworkUnavailableFalse(ctx)
 	if err != nil {
-		glog.Errorf("Unable to set NetworkUnavailable to False for %q: %v", ksm.nodeName, err)
+		log.Errorf("Unable to set NetworkUnavailable to False for %q: %v", ksm.nodeName, err)
 	}
 	return &subnet.Lease{
 		Subnet:     ip.FromIPNet(cidr),
@@ -296,7 +296,7 @@ func (ksm *kubeSubnetManager) WatchLeases(ctx context.Context, cursor interface{
 }
 
 func (ksm *kubeSubnetManager) Run(ctx context.Context) {
-	glog.Infof("Starting kube subnet manager")
+	log.Infof("Starting kube subnet manager")
 	ksm.nodeController.Run(ctx.Done())
 }
 

subnet/watch.go

@@ -17,10 +17,10 @@ package subnet
 import (
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
+	log "k8s.io/klog"
 )
 
 // WatchLeases performs a long term watch of the given network's subnet leases