moved output to glog

pkg/cmd/server/admin/create_keypair.go

@@ -13,7 +13,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -86,15 +85,15 @@ func (o CreateKeyPairOptions) Validate(args []string) error {
 }
 
 func (o CreateKeyPairOptions) CreateKeyPair() error {
-	glog.V(4).Infof("Creating a key pair with: %#v", o)
+	fmt.Fprintf(o.Output, "Creating a key pair with: %#v", o)
 
 	if !o.Overwrite {
 		if _, err := os.Stat(o.PrivateKeyFile); err == nil {
-			glog.V(3).Infof("Keeping existing private key file %s\n", o.PrivateKeyFile)
+			fmt.Fprintf(o.Output, "Keeping existing private key file %s\n", o.PrivateKeyFile)
 			return nil
 		}
 		if _, err := os.Stat(o.PublicKeyFile); err == nil {
-			glog.V(3).Infof("Keeping existing public key file %s\n", o.PublicKeyFile)
+			fmt.Fprintf(o.Output, "Keeping existing public key file %s\n", o.PublicKeyFile)
 			return nil
 		}
 	}

pkg/cmd/server/start/start_allinone.go

@@ -196,6 +196,9 @@ func (o *AllInOneOptions) Complete() error {
 	o.MasterOptions.MasterArgs.NetworkArgs.NetworkPluginName = o.NodeArgs.NetworkPluginName
 	o.MasterOptions.MasterArgs.NetworkArgs.ServiceNetworkCIDR = o.ServiceNetworkCIDR
 
+	// delegated commands should use glog
+	o.MasterOptions.Output = util.NewGLogWriter(3)
+
 	masterAddr, err := o.MasterOptions.MasterArgs.GetMasterAddress()
 	if err != nil {
 		return err

pkg/cmd/server/start/start_master.go

@@ -318,7 +318,7 @@ func (o MasterOptions) CreateCerts() error {
 		APIServerCAFiles:   o.MasterArgs.APIServerCAFiles,
 		CABundleFile:       admin.DefaultCABundleFile(o.MasterArgs.ConfigDir.Value()),
 		PublicAPIServerURL: publicMasterAddr.String(),
-		Output:             o.Output,
+		Output:             util.NewGLogWriter(4),
 	}
 	if err := mintAllCertsOptions.Validate(nil); err != nil {
 		return err

pkg/cmd/util/log.go

@@ -1,6 +1,10 @@
 package util
 
-import "github.com/golang/glog"
+import (
+	"io"
+
+	"github.com/golang/glog"
+)
 
 // GetLogLevel returns the current glog log level
 func GetLogLevel() (level int) {
@@ -11,3 +15,21 @@ func GetLogLevel() (level int) {
 	}
 	return
 }
+
+// NewGLogWriter returns a new Writer that delegates to `glog.Info` at the
+// desired level of verbosity
+func NewGLogWriter(level int) io.Writer {
+	return &gLogWriter{
+		level: level,
+	}
+}
+
+// gLogWriter is a Writer that writes by delegating to `glog.Info`
+type gLogWriter struct {
+	// level is the default level to log at
+	level int
+}
+
+func (w *gLogWriter) Write(p []byte) (n int, err error) {
+	glog.V(w.level).Info(p)
+}