Merge pull request #9355 from PriyaModali/klog

Switch logging implementation from google/glog to kubernetes/klog
kubernetes · Oct 13, 2020 · 5ce9d99 · 5ce9d99
2 parents 79cb6ff + 8936a8c
commit 5ce9d99
Show file tree

Hide file tree

Showing 170 changed files with 1,391 additions and 1,253 deletions.
diff --git a/cmd/minikube/cmd/config/addons.go b/cmd/minikube/cmd/config/addons.go
@@ -17,8 +17,9 @@ limitations under the License.
 package config
 
 import (
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+
+	"k8s.io/klog/v2"
 )
 
 // AddonsCmd represents the addons command
@@ -28,7 +29,7 @@ var AddonsCmd = &cobra.Command{
 	Long:  `addons modifies minikube addons files using subcommands like "minikube addons enable dashboard"`,
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := cmd.Help(); err != nil {
-			glog.Errorf("help: %v", err)
+			klog.Errorf("help: %v", err)
 		}
 	},
 }
diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go
@@ -23,9 +23,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/golang/glog"
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
+	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -114,7 +114,7 @@ var printAddonsList = func(cc *config.ClusterConfig) {
 
 	v, _, err := config.ListProfiles()
 	if err != nil {
-		glog.Errorf("list profiles returned error: %v", err)
+		klog.Errorf("list profiles returned error: %v", err)
 	}
 	if len(v) > 1 {
 		out.T(style.Tip, "To see addons list for other profiles use: `minikube addons -p name list`")

diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go
@@ -19,8 +19,8 @@ package config
 import (
 	"strings"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/localpath"
@@ -185,7 +185,7 @@ var ConfigCmd = &cobra.Command{
 Configurable fields: ` + "\n\n" + configurableFields(),
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := cmd.Help(); err != nil {
-			glog.Errorf("help: %v", err)
+			klog.Errorf("help: %v", err)
 		}
 	},
 }

diff --git a/cmd/minikube/cmd/config/profile_list.go b/cmd/minikube/cmd/config/profile_list.go
@@ -33,9 +33,10 @@ import (
 	"k8s.io/minikube/pkg/minikube/style"
 
 	"github.com/docker/machine/libmachine"
-	"github.com/golang/glog"
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
+
+	"k8s.io/klog/v2"
 )
 
 var output string
@@ -60,7 +61,7 @@ func printProfilesTable() {
 	validProfiles, invalidProfiles, err := config.ListProfiles()
 
 	if err != nil {
-		glog.Warningf("error loading profiles: %v", err)
+		klog.Warningf("error loading profiles: %v", err)
 	}
 
 	if len(validProfiles) == 0 {
@@ -75,7 +76,7 @@ func printProfilesTable() {
 func updateProfilesStatus(profiles []*config.Profile) {
 	api, err := machine.NewAPIClient()
 	if err != nil {
-		glog.Errorf("failed to get machine api client %v", err)
+		klog.Errorf("failed to get machine api client %v", err)
 	}
 	defer api.Close()
 
@@ -92,25 +93,25 @@ func profileStatus(p *config.Profile, api libmachine.API) string {
 
 	host, err := machine.LoadHost(api, driver.MachineName(*p.Config, cp))
 	if err != nil {
-		glog.Warningf("error loading profiles: %v", err)
+		klog.Warningf("error loading profiles: %v", err)
 		return "Unknown"
 	}
 
 	cr, err := machine.CommandRunner(host)
 	if err != nil {
-		glog.Warningf("error loading profiles: %v", err)
+		klog.Warningf("error loading profiles: %v", err)
 		return "Unknown"
 	}
 
 	hostname, _, port, err := driver.ControlPlaneEndpoint(p.Config, &cp, host.DriverName)
 	if err != nil {
-		glog.Warningf("error loading profiles: %v", err)
+		klog.Warningf("error loading profiles: %v", err)
 		return "Unknown"
 	}
 
 	status, err := kverify.APIServerStatus(cr, hostname, port)
 	if err != nil {
-		glog.Warningf("error getting apiserver status for %s: %v", p.Name, err)
+		klog.Warningf("error getting apiserver status for %s: %v", p.Name, err)
 		return "Unknown"
 	}
 	return status.String()

diff --git a/cmd/minikube/cmd/config/prompt.go b/cmd/minikube/cmd/config/prompt.go
@@ -23,8 +23,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/golang/glog"
 	"golang.org/x/crypto/ssh/terminal"
+	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -127,7 +127,7 @@ func AskForPasswordValue(s string) string {
 	}
 	defer func() {
 		if err := terminal.Restore(stdInFd, oldState); err != nil {
-			glog.Errorf("terminal restore failed: %v", err)
+			klog.Errorf("terminal restore failed: %v", err)
 		}
 	}()
 

diff --git a/cmd/minikube/cmd/dashboard.go b/cmd/minikube/cmd/dashboard.go
@@ -26,9 +26,9 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/style"
@@ -61,7 +61,7 @@ var dashboardCmd = &cobra.Command{
 
 		for _, n := range co.Config.Nodes {
 			if err := proxy.ExcludeIP(n.IP); err != nil {
-				glog.Errorf("Error excluding IP from proxy: %s", err)
+				klog.Errorf("Error excluding IP from proxy: %s", err)
 			}
 		}
 
@@ -118,9 +118,9 @@ var dashboardCmd = &cobra.Command{
 			}
 		}
 
-		glog.Infof("Success! I will now quietly sit around until kubectl proxy exits!")
+		klog.Infof("Success! I will now quietly sit around until kubectl proxy exits!")
 		if err = p.Wait(); err != nil {
-			glog.Errorf("Wait: %v", err)
+			klog.Errorf("Wait: %v", err)
 		}
 	},
 }
@@ -143,12 +143,12 @@ func kubectlProxy(kubectlVersion string, contextName string) (*exec.Cmd, string,
 		return nil, "", errors.Wrap(err, "cmd stdout")
 	}
 
-	glog.Infof("Executing: %s %s", cmd.Path, cmd.Args)
+	klog.Infof("Executing: %s %s", cmd.Path, cmd.Args)
 	if err := cmd.Start(); err != nil {
 		return nil, "", errors.Wrap(err, "proxy start")
 	}
 
-	glog.Infof("Waiting for kubectl to output host:port ...")
+	klog.Infof("Waiting for kubectl to output host:port ...")
 	reader := bufio.NewReader(stdoutPipe)
 
 	var out []byte
@@ -161,12 +161,12 @@ func kubectlProxy(kubectlVersion string, contextName string) (*exec.Cmd, string,
 			break
 		}
 		if timedOut {
-			glog.Infof("timed out waiting for input: possibly due to an old kubectl version.")
+			klog.Infof("timed out waiting for input: possibly due to an old kubectl version.")
 			break
 		}
 		out = append(out, r)
 	}
-	glog.Infof("proxy stdout: %s", string(out))
+	klog.Infof("proxy stdout: %s", string(out))
 	return cmd, hostPortRe.FindString(string(out)), nil
 }
 
@@ -203,7 +203,7 @@ func dashboardURL(proxy string, ns string, svc string) string {
 // checkURL checks if a URL returns 200 HTTP OK
 func checkURL(url string) error {
 	resp, err := http.Get(url)
-	glog.Infof("%s response: %v %+v", url, err, resp)
+	klog.Infof("%s response: %v %+v", url, err, resp)
 	if err != nil {
 		return errors.Wrap(err, "checkURL")
 	}