Skip to content

Commit 5ce9d99

Browse files
tstrombergtstromberg
authored
Merge pull request #9355 from PriyaModali/klog
Switch logging implementation from google/glog to kubernetes/klog
2 parents 79cb6ff + 8936a8c commit 5ce9d99

File tree

170 files changed

+1391
-1253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+1391
-1253
lines changed

‎cmd/minikube/cmd/config/addons.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ limitations under the License.
1717
package config
1818

1919
import (
20-
"github.com/golang/glog"
2120
"github.com/spf13/cobra"
21+
22+
"k8s.io/klog/v2"
2223
)
2324

2425
// AddonsCmd represents the addons command
@@ -28,7 +29,7 @@ var AddonsCmd = &cobra.Command{
2829
Long: `addons modifies minikube addons files using subcommands like "minikube addons enable dashboard"`,
2930
Run: func(cmd *cobra.Command, args []string) {
3031
if err := cmd.Help(); err != nil {
31-
glog.Errorf("help: %v", err)
32+
klog.Errorf("help: %v", err)
3233
}
3334
},
3435
}

‎cmd/minikube/cmd/config/addons_list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"sort"
2424
"strings"
2525

26-
"github.com/golang/glog"
2726
"github.com/olekukonko/tablewriter"
2827
"github.com/spf13/cobra"
28+
"k8s.io/klog/v2"
2929
"k8s.io/minikube/pkg/minikube/assets"
3030
"k8s.io/minikube/pkg/minikube/config"
3131
"k8s.io/minikube/pkg/minikube/exit"
@@ -114,7 +114,7 @@ var printAddonsList = func(cc *config.ClusterConfig) {
114114

115115
v, _, err := config.ListProfiles()
116116
if err != nil {
117-
glog.Errorf("list profiles returned error: %v", err)
117+
klog.Errorf("list profiles returned error: %v", err)
118118
}
119119
if len(v) > 1 {
120120
out.T(style.Tip, "To see addons list for other profiles use: `minikube addons -p name list`")

‎cmd/minikube/cmd/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package config
1919
import (
2020
"strings"
2121

22-
"github.com/golang/glog"
2322
"github.com/spf13/cobra"
23+
"k8s.io/klog/v2"
2424
"k8s.io/minikube/pkg/minikube/config"
2525
"k8s.io/minikube/pkg/minikube/driver"
2626
"k8s.io/minikube/pkg/minikube/localpath"
@@ -185,7 +185,7 @@ var ConfigCmd = &cobra.Command{
185185
Configurable fields: ` + "\n\n" + configurableFields(),
186186
Run: func(cmd *cobra.Command, args []string) {
187187
if err := cmd.Help(); err != nil {
188-
glog.Errorf("help: %v", err)
188+
klog.Errorf("help: %v", err)
189189
}
190190
},
191191
}

‎cmd/minikube/cmd/config/profile_list.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ import (
3333
"k8s.io/minikube/pkg/minikube/style"
3434

3535
"github.com/docker/machine/libmachine"
36-
"github.com/golang/glog"
3736
"github.com/olekukonko/tablewriter"
3837
"github.com/spf13/cobra"
38+
39+
"k8s.io/klog/v2"
3940
)
4041

4142
var output string
@@ -60,7 +61,7 @@ func printProfilesTable() {
6061
validProfiles, invalidProfiles, err := config.ListProfiles()
6162

6263
if err != nil {
63-
glog.Warningf("error loading profiles: %v", err)
64+
klog.Warningf("error loading profiles: %v", err)
6465
}
6566

6667
if len(validProfiles) == 0 {
@@ -75,7 +76,7 @@ func printProfilesTable() {
7576
func updateProfilesStatus(profiles []*config.Profile) {
7677
api, err := machine.NewAPIClient()
7778
if err != nil {
78-
glog.Errorf("failed to get machine api client %v", err)
79+
klog.Errorf("failed to get machine api client %v", err)
7980
}
8081
defer api.Close()
8182

@@ -92,25 +93,25 @@ func profileStatus(p *config.Profile, api libmachine.API) string {
9293

9394
host, err := machine.LoadHost(api, driver.MachineName(*p.Config, cp))
9495
if err != nil {
95-
glog.Warningf("error loading profiles: %v", err)
96+
klog.Warningf("error loading profiles: %v", err)
9697
return "Unknown"
9798
}
9899

99100
cr, err := machine.CommandRunner(host)
100101
if err != nil {
101-
glog.Warningf("error loading profiles: %v", err)
102+
klog.Warningf("error loading profiles: %v", err)
102103
return "Unknown"
103104
}
104105

105106
hostname, _, port, err := driver.ControlPlaneEndpoint(p.Config, &cp, host.DriverName)
106107
if err != nil {
107-
glog.Warningf("error loading profiles: %v", err)
108+
klog.Warningf("error loading profiles: %v", err)
108109
return "Unknown"
109110
}
110111

111112
status, err := kverify.APIServerStatus(cr, hostname, port)
112113
if err != nil {
113-
glog.Warningf("error getting apiserver status for %s: %v", p.Name, err)
114+
klog.Warningf("error getting apiserver status for %s: %v", p.Name, err)
114115
return "Unknown"
115116
}
116117
return status.String()

‎cmd/minikube/cmd/config/prompt.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"os"
2424
"strings"
2525

26-
"github.com/golang/glog"
2726
"golang.org/x/crypto/ssh/terminal"
27+
"k8s.io/klog/v2"
2828
"k8s.io/minikube/pkg/minikube/out"
2929
)
3030

@@ -127,7 +127,7 @@ func AskForPasswordValue(s string) string {
127127
}
128128
defer func() {
129129
if err := terminal.Restore(stdInFd, oldState); err != nil {
130-
glog.Errorf("terminal restore failed: %v", err)
130+
klog.Errorf("terminal restore failed: %v", err)
131131
}
132132
}()
133133

‎cmd/minikube/cmd/dashboard.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"regexp"
2727
"time"
2828

29-
"github.com/golang/glog"
3029
"github.com/pkg/errors"
3130
"github.com/spf13/cobra"
31+
"k8s.io/klog/v2"
3232
"k8s.io/minikube/pkg/addons"
3333
"k8s.io/minikube/pkg/minikube/assets"
3434
"k8s.io/minikube/pkg/minikube/style"
@@ -61,7 +61,7 @@ var dashboardCmd = &cobra.Command{
6161

6262
for _, n := range co.Config.Nodes {
6363
if err := proxy.ExcludeIP(n.IP); err != nil {
64-
glog.Errorf("Error excluding IP from proxy: %s", err)
64+
klog.Errorf("Error excluding IP from proxy: %s", err)
6565
}
6666
}
6767

@@ -118,9 +118,9 @@ var dashboardCmd = &cobra.Command{
118118
}
119119
}
120120

121-
glog.Infof("Success! I will now quietly sit around until kubectl proxy exits!")
121+
klog.Infof("Success! I will now quietly sit around until kubectl proxy exits!")
122122
if err = p.Wait(); err != nil {
123-
glog.Errorf("Wait: %v", err)
123+
klog.Errorf("Wait: %v", err)
124124
}
125125
},
126126
}
@@ -143,12 +143,12 @@ func kubectlProxy(kubectlVersion string, contextName string) (*exec.Cmd, string,
143143
return nil, "", errors.Wrap(err, "cmd stdout")
144144
}
145145

146-
glog.Infof("Executing: %s %s", cmd.Path, cmd.Args)
146+
klog.Infof("Executing: %s %s", cmd.Path, cmd.Args)
147147
if err := cmd.Start(); err != nil {
148148
return nil, "", errors.Wrap(err, "proxy start")
149149
}
150150

151-
glog.Infof("Waiting for kubectl to output host:port ...")
151+
klog.Infof("Waiting for kubectl to output host:port ...")
152152
reader := bufio.NewReader(stdoutPipe)
153153

154154
var out []byte
@@ -161,12 +161,12 @@ func kubectlProxy(kubectlVersion string, contextName string) (*exec.Cmd, string,
161161
break
162162
}
163163
if timedOut {
164-
glog.Infof("timed out waiting for input: possibly due to an old kubectl version.")
164+
klog.Infof("timed out waiting for input: possibly due to an old kubectl version.")
165165
break
166166
}
167167
out = append(out, r)
168168
}
169-
glog.Infof("proxy stdout: %s", string(out))
169+
klog.Infof("proxy stdout: %s", string(out))
170170
return cmd, hostPortRe.FindString(string(out)), nil
171171
}
172172

@@ -203,7 +203,7 @@ func dashboardURL(proxy string, ns string, svc string) string {
203203
// checkURL checks if a URL returns 200 HTTP OK
204204
func checkURL(url string) error {
205205
resp, err := http.Get(url)
206-
glog.Infof("%s response: %v %+v", url, err, resp)
206+
klog.Infof("%s response: %v %+v", url, err, resp)
207207
if err != nil {
208208
return errors.Wrap(err, "checkURL")
209209
}

0 commit comments

Comments
 (0)