Merge pull request #2835 from smarterclayton/remove_unnecessary_prints

Merged by openshift-bot

Author: OpenShift Bot

pkg/cmd/cli/cmd/request_project.go

@@ -67,7 +67,6 @@ func NewCmdRequestProject(name, fullName, oscLoginName, oscProjectName string, f
 			}
 		},
 	}
-	cmd.SetOutput(out)
 
 	cmd.Flags().StringVar(&options.DisplayName, "display-name", "", "Project display name")
 	cmd.Flags().StringVar(&options.Description, "description", "", "Project description")

pkg/cmd/server/admin/create_bootstrap_project_template.go

@@ -41,7 +41,6 @@ func NewCommandCreateBootstrapProjectTemplate(f *clientcmd.Factory, commandName
 			}
 		},
 	}
-	cmd.SetOutput(out)
 
 	cmd.Flags().StringVar(&options.Name, "name", delegated.DefaultTemplateName, "The name of the template to output.")
 	cmdutil.AddPrinterFlags(cmd)

pkg/cmd/server/admin/create_bootstrappolicy_file.go

@@ -47,7 +47,6 @@ func NewCommandCreateBootstrapPolicyFile(commandName string, fullName string, ou
 			}
 		},
 	}
-	cmd.SetOutput(out)
 
 	flags := cmd.Flags()
 

pkg/cmd/server/admin/create_client.go

@@ -12,7 +12,6 @@ import (
 	kcmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 )
 
 const CreateClientCommandName = "create-api-client-config"
@@ -28,7 +27,7 @@ type CreateClientOptions struct {
 	APIServerCAFile    string
 	APIServerURL       string
 	PublicAPIServerURL string
-	Output             cmdutil.Output
+	Output             io.Writer
 }
 
 const createClientLong = `
@@ -40,7 +39,7 @@ master as the provided user.
 `
 
 func NewCommandCreateClient(commandName string, fullName string, out io.Writer) *cobra.Command {
-	options := &CreateClientOptions{GetSignerCertOptions: &GetSignerCertOptions{}, Output: cmdutil.Output{out}}
+	options := &CreateClientOptions{GetSignerCertOptions: &GetSignerCertOptions{}, Output: out}
 
 	cmd := &cobra.Command{
 		Use:   commandName,
@@ -56,7 +55,6 @@ func NewCommandCreateClient(commandName string, fullName string, out io.Writer)
 			}
 		},
 	}
-	cmd.SetOutput(out)
 
 	flags := cmd.Flags()
 
@@ -102,7 +100,7 @@ func (o CreateClientOptions) Validate(args []string) error {
 }
 
 func (o CreateClientOptions) CreateClientFolder() error {
-	glog.V(2).Infof("creating a .kubeconfig with: %#v", o)
+	glog.V(4).Infof("creating a .kubeconfig with: %#v", o)
 
 	clientCertFile := DefaultCertFilename(o.ClientDir, o.User)
 	clientKeyFile := DefaultKeyFilename(o.ClientDir, o.User)

pkg/cmd/server/admin/create_clientcert.go

@@ -2,15 +2,14 @@ package admin
 
 import (
 	"errors"
-	"fmt"
+	"io"
 
 	"github.com/golang/glog"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 )
 
 type CreateClientCertOptions struct {
@@ -23,7 +22,7 @@ type CreateClientCertOptions struct {
 	Groups util.StringList
 
 	Overwrite bool
-	Output    cmdutil.Output
+	Output    io.Writer
 }
 
 func (o CreateClientCertOptions) Validate(args []string) error {
@@ -51,7 +50,7 @@ func (o CreateClientCertOptions) Validate(args []string) error {
 }
 
 func (o CreateClientCertOptions) CreateClientCert() (*crypto.TLSCertificateConfig, error) {
-	glog.V(2).Infof("Creating a client cert with: %#v and %#v", o, o.GetSignerCertOptions)
+	glog.V(4).Infof("Creating a client cert with: %#v and %#v", o, o.GetSignerCertOptions)
 
 	signerCert, err := o.GetSignerCertOptions.GetSignerCert()
 	if err != nil {
@@ -67,9 +66,9 @@ func (o CreateClientCertOptions) CreateClientCert() (*crypto.TLSCertificateConfi
 		cert, written, err = signerCert.EnsureClientCertificate(o.CertFile, o.KeyFile, userInfo)
 	}
 	if written {
-		fmt.Fprintf(o.Output.Get(), "Generated new client cert as %s and key as %s\n", o.CertFile, o.KeyFile)
+		glog.V(3).Infof("Generated new client cert as %s and key as %s\n", o.CertFile, o.KeyFile)
 	} else {
-		fmt.Fprintf(o.Output.Get(), "Keeping existing client cert at %s and key at %s\n", o.CertFile, o.KeyFile)
+		glog.V(3).Infof("Keeping existing client cert at %s and key at %s\n", o.CertFile, o.KeyFile)
 	}
 	return cert, err
 }

pkg/cmd/server/admin/create_keypair.go

@@ -17,7 +17,6 @@ import (
 	"github.com/spf13/cobra"
 
 	kcmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 )
 
 const CreateKeyPairCommandName = "create-key-pair"
@@ -27,7 +26,7 @@ type CreateKeyPairOptions struct {
 	PrivateKeyFile string
 
 	Overwrite bool
-	Output    cmdutil.Output
+	Output    io.Writer
 }
 
 const create_key_pair_long = `
@@ -40,7 +39,7 @@ Example: Creating service account signing and authenticating key files:
 `
 
 func NewCommandCreateKeyPair(commandName string, fullName string, out io.Writer) *cobra.Command {
-	options := &CreateKeyPairOptions{Output: cmdutil.Output{out}}
+	options := &CreateKeyPairOptions{Output: out}
 
 	cmd := &cobra.Command{
 		Use:   commandName,
@@ -55,7 +54,6 @@ func NewCommandCreateKeyPair(commandName string, fullName string, out io.Writer)
 			kcmdutil.CheckErr(err)
 		},
 	}
-	cmd.SetOutput(out)
 
 	flags := cmd.Flags()
 
@@ -85,15 +83,15 @@ func (o CreateKeyPairOptions) Validate(args []string) error {
 }
 
 func (o CreateKeyPairOptions) CreateKeyPair() error {
-	glog.V(2).Infof("Creating a key pair with: %#v", o)
+	glog.V(4).Infof("Creating a key pair with: %#v", o)
 
 	if !o.Overwrite {
 		if _, err := os.Stat(o.PrivateKeyFile); err == nil {
-			fmt.Fprintf(o.Output.Get(), "Keeping existing private key file %s\n", o.PrivateKeyFile)
+			glog.V(3).Infof("Keeping existing private key file %s\n", o.PrivateKeyFile)
 			return nil
 		}
 		if _, err := os.Stat(o.PublicKeyFile); err == nil {
-			fmt.Fprintf(o.Output.Get(), "Keeping existing public key file %s\n", o.PublicKeyFile)
+			glog.V(3).Infof("Keeping existing public key file %s\n", o.PublicKeyFile)
 			return nil
 		}
 	}
@@ -111,7 +109,7 @@ func (o CreateKeyPairOptions) CreateKeyPair() error {
 		return err
 	}
 
-	fmt.Fprintf(o.Output.Get(), "Generated new key pair as %s and %s\n", o.PublicKeyFile, o.PrivateKeyFile)
+	fmt.Fprintf(o.Output, "Generated new key pair as %s and %s\n", o.PublicKeyFile, o.PrivateKeyFile)
 
 	return nil
 }

pkg/cmd/server/admin/create_kubeconfig.go

@@ -2,7 +2,6 @@ package admin
 
 import (
 	"errors"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
@@ -18,7 +17,6 @@ import (
 	clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"
 	cliconfig "github.com/openshift/origin/pkg/cmd/cli/config"
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 )
 
 const CreateKubeConfigCommandName = "create-kubeconfig"
@@ -34,11 +32,11 @@ type CreateKubeConfigOptions struct {
 	ContextNamespace string
 
 	KubeConfigFile string
-	Output         cmdutil.Output
+	Output         io.Writer
 }
 
 func NewCommandCreateKubeConfig(commandName string, fullName string, out io.Writer) *cobra.Command {
-	options := &CreateKubeConfigOptions{Output: cmdutil.Output{out}}
+	options := &CreateKubeConfigOptions{Output: out}
 
 	cmd := &cobra.Command{
 		Use:   commandName,
@@ -84,7 +82,6 @@ users:
 			}
 		},
 	}
-	cmd.SetOutput(out)
 
 	flags := cmd.Flags()
 
@@ -126,7 +123,7 @@ func (o CreateKubeConfigOptions) Validate(args []string) error {
 }
 
 func (o CreateKubeConfigOptions) CreateKubeConfig() (*clientcmdapi.Config, error) {
-	glog.V(2).Infof("creating a .kubeconfig with: %#v", o)
+	glog.V(4).Infof("creating a .kubeconfig with: %#v", o)
 
 	// read all the refenced filenames
 	caData, err := ioutil.ReadFile(o.APIServerCAFile)
@@ -200,7 +197,7 @@ func (o CreateKubeConfigOptions) CreateKubeConfig() (*clientcmdapi.Config, error
 		CurrentContext: contextNick,
 	}
 
-	fmt.Fprintf(o.Output.Get(), "Generating '%s' API client config as %s\n", userNick, o.KubeConfigFile)
+	glog.V(3).Infof("Generating '%s' API client config as %s\n", userNick, o.KubeConfigFile)
 	// Ensure the parent dir exists
 	if err := os.MkdirAll(filepath.Dir(o.KubeConfigFile), os.FileMode(0755)); err != nil {
 		return nil, err

pkg/cmd/server/admin/create_mastercerts.go

@@ -13,7 +13,6 @@ import (
 	kcmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 )
 
 const CreateMasterCertsCommandName = "create-master-certs"
@@ -72,11 +71,11 @@ type CreateMasterCertsOptions struct {
 	PublicAPIServerURL string
 
 	Overwrite bool
-	Output    cmdutil.Output
+	Output    io.Writer
 }
 
 func NewCommandCreateMasterCerts(commandName string, fullName string, out io.Writer) *cobra.Command {
-	options := &CreateMasterCertsOptions{Output: cmdutil.Output{out}}
+	options := &CreateMasterCertsOptions{Output: out}
 
 	cmd := &cobra.Command{
 		Use:   commandName,
@@ -92,7 +91,6 @@ func NewCommandCreateMasterCerts(commandName string, fullName string, out io.Wri
 			}
 		},
 	}
-	cmd.SetOutput(out)
 
 	flags := cmd.Flags()
 
@@ -128,7 +126,7 @@ func (o CreateMasterCertsOptions) Validate(args []string) error {
 }
 
 func (o CreateMasterCertsOptions) CreateMasterCerts() error {
-	glog.V(2).Infof("Creating all certs with: %#v", o)
+	glog.V(4).Infof("Creating all certs with: %#v", o)
 
 	signerCertOptions := CreateSignerCertOptions{
 		CertFile:   DefaultCertFilename(o.CertDir, CAFilePrefix),

pkg/cmd/server/admin/create_nodeconfig.go

@@ -49,12 +49,13 @@ type CreateNodeConfigOptions struct {
 	NodeClientCAFile  string
 	APIServerCAFile   string
 	APIServerURL      string
-	Output            cmdutil.Output
+	Output            io.Writer
 	NetworkPluginName string
 }
 
 func NewCommandNodeConfig(commandName string, fullName string, out io.Writer) *cobra.Command {
 	options := NewDefaultCreateNodeConfigOptions()
+	options.Output = out
 
 	cmd := &cobra.Command{
 		Use:   commandName,
@@ -69,8 +70,6 @@ func NewCommandNodeConfig(commandName string, fullName string, out io.Writer) *c
 			}
 		},
 	}
-	cmd.SetOutput(out)
-	options.Output = cmdutil.Output{out}
 
 	flags := cmd.Flags()
 
@@ -211,6 +210,8 @@ func (o CreateNodeConfigOptions) CreateNodeFolder() error {
 	nodeConfigFile := path.Join(o.NodeConfigDir, "node-config.yaml")
 	nodeJSONFile := path.Join(o.NodeConfigDir, "node-registration.json")
 
+	fmt.Fprintf(o.Output, "Generating node credentials ...\n")
+
 	if err := o.MakeClientCert(clientCertFile, clientKeyFile); err != nil {
 		return err
 	}
@@ -237,6 +238,8 @@ func (o CreateNodeConfigOptions) CreateNodeFolder() error {
 		return err
 	}
 
+	fmt.Fprintf(o.Output, "Created node config for %s in %s\n", o.NodeName, o.NodeConfigDir)
+
 	return nil
 }
 
@@ -383,7 +386,6 @@ func (o CreateNodeConfigOptions) MakeNodeConfig(serverCertFile, serverKeyFile, n
 		return err
 	}
 
-	fmt.Fprintf(o.Output.Get(), "Creating node config for %s in %s\n", o.NodeName, o.NodeConfigDir)
 	// Relativize to config file dir
 	base, err := cmdutil.MakeAbs(o.NodeConfigDir, cwd)
 	if err != nil {

pkg/cmd/server/admin/create_servercert.go

@@ -10,7 +10,6 @@ import (
 
 	kcmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
 )
@@ -25,7 +24,7 @@ type CreateServerCertOptions struct {
 
 	Hostnames util.StringList
 	Overwrite bool
-	Output    cmdutil.Output
+	Output    io.Writer
 }
 
 const create_server_long = `
@@ -44,7 +43,7 @@ Example: Creating a secure router certificate.
 `
 
 func NewCommandCreateServerCert(commandName string, fullName string, out io.Writer) *cobra.Command {
-	options := &CreateServerCertOptions{GetSignerCertOptions: &GetSignerCertOptions{}, Output: cmdutil.Output{out}}
+	options := &CreateServerCertOptions{GetSignerCertOptions: &GetSignerCertOptions{}, Output: out}
 
 	cmd := &cobra.Command{
 		Use:   commandName,
@@ -60,7 +59,6 @@ func NewCommandCreateServerCert(commandName string, fullName string, out io.Writ
 			}
 		},
 	}
-	cmd.SetOutput(out)
 
 	flags := cmd.Flags()
 	BindGetSignerCertOptions(options.GetSignerCertOptions, flags, "")
@@ -99,7 +97,7 @@ func (o CreateServerCertOptions) Validate(args []string) error {
 }
 
 func (o CreateServerCertOptions) CreateServerCert() (*crypto.TLSCertificateConfig, error) {
-	glog.V(2).Infof("Creating a server cert with: %#v", o)
+	glog.V(4).Infof("Creating a server cert with: %#v", o)
 
 	signerCert, err := o.GetSignerCertOptions.GetSignerCert()
 	if err != nil {
@@ -114,9 +112,9 @@ func (o CreateServerCertOptions) CreateServerCert() (*crypto.TLSCertificateConfi
 		ca, written, err = signerCert.EnsureServerCert(o.CertFile, o.KeyFile, util.NewStringSet([]string(o.Hostnames)...))
 	}
 	if written {
-		fmt.Fprintf(o.Output.Get(), "Generated new server certificate as %s, key as %s\n", o.CertFile, o.KeyFile)
+		glog.V(3).Infof("Generated new server certificate as %s, key as %s\n", o.CertFile, o.KeyFile)
 	} else {
-		fmt.Fprintf(o.Output.Get(), "Keeping existing server certificate at %s, key at %s\n", o.CertFile, o.KeyFile)
+		glog.V(3).Infof("Keeping existing server certificate at %s, key at %s\n", o.CertFile, o.KeyFile)
 	}
 	return ca, err
 }