Merge pull request #11 from elotl/vilmos-klog

Switch to klog

cmd/virtual-kubelet/main.go

@@ -19,8 +19,9 @@ import (
 	"context"
 	"strings"
 
-	"github.com/elotl/cloud-instance-provider/pkg/glog"
+	"github.com/elotl/cloud-instance-provider/pkg/klog"
 	"github.com/elotl/cloud-instance-provider/pkg/server"
+	"github.com/elotl/cloud-instance-provider/pkg/util/habitat"
 	cli "github.com/virtual-kubelet/node-cli"
 	opencensuscli "github.com/virtual-kubelet/node-cli/opencensus"
 	"github.com/virtual-kubelet/node-cli/opts"
@@ -39,7 +40,7 @@ var (
 func main() {
 	ctx := cli.ContextWithCancelOnSignal(context.Background())
 
-	log.L = glog.NewGlogAdapter()
+	log.L = klog.NewKlogAdapter()
 
 	trace.T = opencensus.Adapter{}
 	traceConfig := opencensuscli.Config{
@@ -63,10 +64,21 @@ func main() {
 		cli.WithCLIVersion(buildVersion, buildTime),
 		cli.WithProvider("cloud-instance-provider",
 			func(cfg provider.InitConfig) (provider.Provider, error) {
+				internalIP := cfg.InternalIP
+				if internalIP == "" {
+					internalIP = habitat.GetMyIP()
+					if internalIP == "" {
+						ips := habitat.GetIPAddresses()
+						if len(ips) > 0 {
+							internalIP = ips[0]
+						}
+					}
+				}
+				log.G(ctx).Infof("node internal IP address: %q", internalIP)
 				return server.NewInstanceProvider(
 					cfg.ConfigPath,
 					cfg.NodeName,
-					cfg.InternalIP,
+					internalIP,
 					cfg.DaemonPort,
 					serverConfig.DebugServer,
 					cfg.ResourceManager,

deploy/virtual-kubelet.yaml

@@ -80,6 +80,8 @@ spec:
         - cloud-instance-provider
         - --provider-config
         - /etc/virtual-kubelet/server.yml
+        - --klog.logtostderr
+        - --klog.v=5
         image: elotl/virtual-kubelet:dev
         imagePullPolicy: Always
         name: virtual-kubelet

pkg/api/codec.go

@@ -4,7 +4,7 @@ package api
 import (
 	"github.com/json-iterator/go"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
@@ -37,7 +37,7 @@ func (c JsonCodec) Marshal(i interface{}) ([]byte, error) {
 func warnIfUnversioned(t TypeVersioner) {
 	version := t.GetAPIVersion()
 	if version == "" {
-		glog.Warningf("Found empty API version in registry for %v", t)
+		klog.Warningf("Found empty API version in registry for %v", t)
 	}
 }
 

pkg/certs/factory.go

@@ -10,7 +10,7 @@ import (
 	"github.com/docker/libkv/store"
 	"github.com/elotl/cloud-instance-provider/pkg/etcd"
 	"github.com/elotl/cloud-instance-provider/pkg/util"
-	"github.com/golang/glog"
+	"k8s.io/klog"
 )
 
 const (
@@ -33,7 +33,7 @@ func New(kvstore etcd.Storer) (*CertificateFactory, error) {
 	certFactory.kvstore.Put(CertificateDirectoryPlaceholder, []byte("."), nil)
 	err := certFactory.GetRootFromStore()
 	if err == store.ErrKeyNotFound {
-		glog.Infof("Initializing Milpa root certificate")
+		klog.V(2).Infof("Initializing Milpa root certificate")
 		certFactory.InitRootCert()
 	} else if err != nil {
 		return nil, util.WrapError(err, "Error creating Milpa PKI")

pkg/etcd/etcd.go

@@ -16,8 +16,8 @@ import (
 	"github.com/coreos/etcd/pkg/transport"
 	"github.com/docker/libkv/store"
 	"github.com/elotl/cloud-instance-provider/pkg/util"
-	"github.com/golang/glog"
 	"golang.org/x/sys/unix"
+	"k8s.io/klog"
 )
 
 var (
@@ -37,7 +37,7 @@ func ensureEtcdDataDir(dataDir string) error {
 	errMsg := fmt.Sprintf("Could not create milpa storage directory at %s, please verify the directory exists and is writable by milpa. The error was", dataDir)
 	_, err := os.Stat(dataDir)
 	if os.IsNotExist(err) {
-		glog.Infof("Creating milpa data directory at %s", dataDir)
+		klog.V(2).Infof("Creating milpa data directory at %s", dataDir)
 		err := os.MkdirAll(dataDir, 0750)
 		if err != nil {
 			return util.WrapError(err, errMsg)
@@ -86,13 +86,13 @@ func (s *EtcdServer) Start(quit <-chan struct{}, wg *sync.WaitGroup) error {
 		cfg.LCUrls = []url.URL{}
 	}
 	if cfg.AutoCompactionMode == "" {
-		glog.Info("Setting etcd compaction mode to periodic")
+		klog.V(2).Info("Setting etcd compaction mode to periodic")
 		cfg.AutoCompactionMode = compactor.ModePeriodic
 	}
 	if cfg.AutoCompactionMode == compactor.ModePeriodic &&
 		cfg.AutoCompactionRetention == "" {
 		cfg.AutoCompactionRetention = "1"
-		glog.Info("Setting etcd compaction interval to 1 hour")
+		klog.V(2).Info("Setting etcd compaction interval to 1 hour")
 	}
 
 	err = s.reconcileDataDirectoryValues(cfg)
@@ -110,7 +110,7 @@ func (s *EtcdServer) Start(quit <-chan struct{}, wg *sync.WaitGroup) error {
 	}
 	select {
 	case <-s.Proc.Server.ReadyNotify():
-		glog.Info("Etcd server is ready to serve requests")
+		klog.V(2).Info("Etcd server is ready to serve requests")
 	case <-time.After(60 * time.Second):
 		s.Proc.Server.Stop()
 		s.Proc.Close()
@@ -127,7 +127,7 @@ func (s *EtcdServer) Start(quit <-chan struct{}, wg *sync.WaitGroup) error {
 		<-quit
 		// if we don't pause, clients will crash, it's a bad look.
 		pause := 2 * time.Second
-		glog.Infof("Pausing for %ds before shutting down etcd...", int(pause.Seconds()))
+		klog.V(2).Infof("Pausing for %ds before shutting down etcd...", int(pause.Seconds()))
 		time.Sleep(pause)
 		s.Proc.Server.Stop()
 		s.Proc.Close()

pkg/etcd/etcd_test_helpers.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 )
 
 func SetupEmbeddedEtcdTest() (*SimpleEtcd, func(), error) {
@@ -18,7 +18,7 @@ func SetupEmbeddedEtcdTest() (*SimpleEtcd, func(), error) {
 	closer := func() {
 		quit <- struct{}{}
 		if err := os.RemoveAll(dataDir); err != nil {
-			glog.Fatal("Error removing etcd data directory")
+			klog.Fatal("Error removing etcd data directory")
 		}
 	}
 	db := EtcdServer{