From 51192ac18f7e9616bdfb0590b3a52cc3015d32d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:34:05 +0000 Subject: [PATCH 1/2] Build(deps): Bump k8s.io/klog/v2 from 2.100.1 to 2.110.1 Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.100.1 to 2.110.1. - [Release notes](https://github.com/kubernetes/klog/releases) - [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes/klog/compare/v2.100.1...v2.110.1) --- updated-dependencies: - dependency-name: k8s.io/klog/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index fe6e90e6438b..b516d61c4a12 100644 --- a/go.mod +++ b/go.mod @@ -74,7 +74,7 @@ require ( k8s.io/client-go v0.28.3 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.28.3 - k8s.io/klog/v2 v2.100.1 + k8s.io/klog/v2 v2.110.1 k8s.io/kubectl v0.28.3 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 libvirt.org/go/libvirt v1.9007.0 @@ -133,7 +133,7 @@ require ( github.com/fvbommel/sortorder v1.1.0 // indirect github.com/go-fonts/liberation v0.3.1 // indirect github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect diff --git a/go.sum b/go.sum index 4ea210aa18e8..2b1b7850434c 100644 --- a/go.sum +++ b/go.sum @@ -679,8 +679,8 @@ github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= @@ -2521,8 +2521,8 @@ k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= -k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= +k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= From 197b9343b0ef6ffb2c793b137e9351023c4ae3a7 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 1 Nov 2023 11:45:09 -0700 Subject: [PATCH 2/2] fix lint issues --- cmd/minikube/cmd/logs.go | 2 +- pkg/minikube/command/ssh_runner.go | 2 +- pkg/minikube/cruntime/containerd.go | 2 +- pkg/minikube/tunnel/kic/service_tunnel.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go index 5fc2a53d69c1..d49e4162f0fb 100644 --- a/cmd/minikube/cmd/logs.go +++ b/cmd/minikube/cmd/logs.go @@ -70,7 +70,7 @@ var logsCmd = &cobra.Command{ defer func() { err := logOutput.Close() if err != nil { - klog.Warning("Failed to close file: %v", err) + klog.Warningf("Failed to close file: %v", err) } }() if err != nil { diff --git a/pkg/minikube/command/ssh_runner.go b/pkg/minikube/command/ssh_runner.go index ca741aa4d99d..0ff69c58cc5f 100644 --- a/pkg/minikube/command/ssh_runner.go +++ b/pkg/minikube/command/ssh_runner.go @@ -501,7 +501,7 @@ func (s *SSHRunner) CopyFrom(f assets.CopyableFile) error { // ReadableFile returns assets.ReadableFile for the sourcePath (via `stat` command) func (s *SSHRunner) ReadableFile(sourcePath string) (assets.ReadableFile, error) { - klog.V(4).Infof("NewsshReadableFile: %s -> %s", sourcePath) + klog.V(4).Infof("NewsshReadableFile: %s", sourcePath) if !strings.HasPrefix(sourcePath, "/") { return nil, fmt.Errorf("sourcePath must be an absolute Path. Relative Path is not allowed") diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 1d52a1b55839..aa99dc696f6e 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -409,7 +409,7 @@ func (r *Containerd) BuildImage(src string, file string, tag string, push bool, // PushImage pushes an image func (r *Containerd) PushImage(name string) error { - klog.Infof("Pushing image %s: %s", name) + klog.Infof("Pushing image %s", name) c := exec.Command("sudo", "ctr", "-n=k8s.io", "images", "push", name) if _, err := r.Runner.RunCmd(c); err != nil { return errors.Wrapf(err, "ctr images push") diff --git a/pkg/minikube/tunnel/kic/service_tunnel.go b/pkg/minikube/tunnel/kic/service_tunnel.go index 8b924c73fbd4..264301f74c57 100644 --- a/pkg/minikube/tunnel/kic/service_tunnel.go +++ b/pkg/minikube/tunnel/kic/service_tunnel.go @@ -79,6 +79,6 @@ func (t *ServiceTunnel) Start(svcName, namespace string) ([]string, error) { func (t *ServiceTunnel) Stop() { err := t.sshConn.stop() if err != nil { - klog.Warningf("Failed to stop ssh tunnel", err) + klog.Warningf("Failed to stop ssh tunnel: %v", err) } }