From 2db4dea56544cf1c2aaea4f4af10636f7ae2f8e4 Mon Sep 17 00:00:00 2001 From: JunYang Date: Fri, 5 Aug 2022 09:44:34 +0800 Subject: [PATCH] use klog.InfoS instead of klog.V(0).InfoS --- cmd/kube-proxy/app/server.go | 2 +- cmd/kube-proxy/app/server_others.go | 18 +++++++++--------- cmd/kube-proxy/app/server_windows.go | 8 ++++---- .../nodeipam/ipam/controller_legacyprovider.go | 2 +- pkg/controller/podgc/gc_controller.go | 4 ++-- pkg/registry/core/service/storage/alloc.go | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 9ff177747a9..cafb1a04da4 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -814,7 +814,7 @@ func detectNodeIP(client clientset.Interface, hostname, bindAddress string) net. nodeIP = utilnode.GetNodeIP(client, hostname) } if nodeIP == nil { - klog.V(0).InfoS("Can't determine this node's IP, assuming 127.0.0.1; if this is incorrect, please set the --bind-address flag") + klog.InfoS("Can't determine this node's IP, assuming 127.0.0.1; if this is incorrect, please set the --bind-address flag") nodeIP = netutils.ParseIPSloppy("127.0.0.1") } return nodeIP diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go index f203f87a738..7e880f847f3 100644 --- a/cmd/kube-proxy/app/server_others.go +++ b/cmd/kube-proxy/app/server_others.go @@ -170,22 +170,22 @@ func newProxyServer( for _, perFamilyIpt := range ipt { if !perFamilyIpt.Present() { - klog.V(0).InfoS("kube-proxy running in single-stack mode, this ipFamily is not supported", "ipFamily", perFamilyIpt.Protocol()) + klog.InfoS("kube-proxy running in single-stack mode, this ipFamily is not supported", "ipFamily", perFamilyIpt.Protocol()) dualStack = false } } } if proxyMode == proxyconfigapi.ProxyModeIPTables { - klog.V(0).InfoS("Using iptables Proxier") + klog.InfoS("Using iptables Proxier") if config.IPTables.MasqueradeBit == nil { // MasqueradeBit must be specified or defaulted. return nil, fmt.Errorf("unable to read IPTables MasqueradeBit from config") } if dualStack { - klog.V(0).InfoS("kube-proxy running in dual-stack mode", "ipFamily", iptInterface.Protocol()) - klog.V(0).InfoS("Creating dualStackProxier for iptables") + klog.InfoS("kube-proxy running in dual-stack mode", "ipFamily", iptInterface.Protocol()) + klog.InfoS("Creating dualStackProxier for iptables") // Always ordered to match []ipt var localDetectors [2]proxyutiliptables.LocalTrafficDetector localDetectors, err = getDualStackLocalDetectorTuple(detectLocalMode, config, ipt, nodeInfo) @@ -247,9 +247,9 @@ func newProxyServer( } ipvsInterface = utilipvs.New() - klog.V(0).InfoS("Using ipvs Proxier") + klog.InfoS("Using ipvs Proxier") if dualStack { - klog.V(0).InfoS("Creating dualStackProxier for ipvs") + klog.InfoS("Creating dualStackProxier for ipvs") nodeIPs := nodeIPTuple(config.BindAddress) @@ -321,8 +321,8 @@ func newProxyServer( } proxymetrics.RegisterMetrics() } else { - klog.V(0).InfoS("Using userspace Proxier") - klog.V(0).InfoS("The userspace proxier is now deprecated and will be removed in a future release, please use 'iptables' or 'ipvs' instead") + klog.InfoS("Using userspace Proxier") + klog.InfoS("The userspace proxier is now deprecated and will be removed in a future release, please use 'iptables' or 'ipvs' instead") // TODO this has side effects that should only happen when Run() is invoked. proxier, err = userspace.NewProxier( @@ -453,7 +453,7 @@ func getLocalDetector(mode proxyconfigapi.LocalMode, config *proxyconfigapi.Kube } return proxyutiliptables.NewDetectLocalByInterfaceNamePrefix(config.DetectLocal.InterfaceNamePrefix) } - klog.V(0).InfoS("Defaulting to no-op detect-local", "detect-local-mode", string(mode)) + klog.InfoS("Defaulting to no-op detect-local", "detect-local-mode", string(mode)) return proxyutiliptables.NewNoOpLocalDetector(), nil } diff --git a/cmd/kube-proxy/app/server_windows.go b/cmd/kube-proxy/app/server_windows.go index 836b95a0f25..cea3279e8ce 100644 --- a/cmd/kube-proxy/app/server_windows.go +++ b/cmd/kube-proxy/app/server_windows.go @@ -105,9 +105,9 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, master string proxyMode := getProxyMode(config.Mode, winkernel.WindowsKernelCompatTester{}) dualStackMode := getDualStackMode(config.Winkernel.NetworkName, winkernel.DualStackCompatTester{}) if proxyMode == proxyconfigapi.ProxyModeKernelspace { - klog.V(0).InfoS("Using Kernelspace Proxier.") + klog.InfoS("Using Kernelspace Proxier.") if dualStackMode { - klog.V(0).InfoS("Creating dualStackProxier for Windows kernel.") + klog.InfoS("Creating dualStackProxier for Windows kernel.") proxier, err = winkernel.NewDualStackProxier( config.IPTables.SyncPeriod.Duration, @@ -146,8 +146,8 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, master string winkernel.RegisterMetrics() } else { - klog.V(0).InfoS("Using userspace Proxier.") - klog.V(0).InfoS("The userspace proxier is now deprecated and will be removed in a future release, please use 'kernelspace' instead") + klog.InfoS("Using userspace Proxier.") + klog.InfoS("The userspace proxier is now deprecated and will be removed in a future release, please use 'kernelspace' instead") execer := exec.New() var netshInterface utilnetsh.Interface netshInterface = utilnetsh.New(execer) diff --git a/pkg/controller/nodeipam/ipam/controller_legacyprovider.go b/pkg/controller/nodeipam/ipam/controller_legacyprovider.go index 4e1af6091e5..2012f11af6d 100644 --- a/pkg/controller/nodeipam/ipam/controller_legacyprovider.go +++ b/pkg/controller/nodeipam/ipam/controller_legacyprovider.go @@ -113,7 +113,7 @@ func NewController( // registers the informers for node changes. This will start synchronization // of the node and cloud CIDR range allocations. func (c *Controller) Start(nodeInformer informers.NodeInformer) error { - klog.V(0).InfoS("Starting IPAM controller", "config", c.config) + klog.InfoS("Starting IPAM controller", "config", c.config) nodes, err := listNodes(c.adapter.k8s) if err != nil { diff --git a/pkg/controller/podgc/gc_controller.go b/pkg/controller/podgc/gc_controller.go index 447123cca57..482ef909639 100644 --- a/pkg/controller/podgc/gc_controller.go +++ b/pkg/controller/podgc/gc_controller.go @@ -249,7 +249,7 @@ func (gcc *PodGCController) gcOrphaned(ctx context.Context, pods []*v1.Pod, node if err := gcc.markFailedAndDeletePodWithCondition(ctx, pod, condition); err != nil { utilruntime.HandleError(err) } else { - klog.V(0).InfoS("Forced deletion of orphaned Pod succeeded", "pod", klog.KObj(pod)) + klog.InfoS("Forced deletion of orphaned Pod succeeded", "pod", klog.KObj(pod)) } } } @@ -298,7 +298,7 @@ func (gcc *PodGCController) gcUnscheduledTerminating(ctx context.Context, pods [ if err := gcc.markFailedAndDeletePod(ctx, pod); err != nil { utilruntime.HandleError(err) } else { - klog.V(0).InfoS("Forced deletion of unscheduled terminating Pod succeeded", "pod", klog.KObj(pod)) + klog.InfoS("Forced deletion of unscheduled terminating Pod succeeded", "pod", klog.KObj(pod)) } } } diff --git a/pkg/registry/core/service/storage/alloc.go b/pkg/registry/core/service/storage/alloc.go index 8da5cba0a30..ee1a0f717b5 100644 --- a/pkg/registry/core/service/storage/alloc.go +++ b/pkg/registry/core/service/storage/alloc.go @@ -324,7 +324,7 @@ func (al *Allocators) txnAllocClusterIPs(service *api.Service, dryRun bool) (tra commit: func() { if !dryRun { if len(allocated) > 0 { - klog.V(0).InfoS("allocated clusterIPs", + klog.InfoS("allocated clusterIPs", "service", klog.KObj(service), "clusterIPs", allocated) } @@ -614,7 +614,7 @@ func (al *Allocators) txnUpdateClusterIPs(after After, before Before, dryRun boo return } if len(allocated) > 0 { - klog.V(0).InfoS("allocated clusterIPs", + klog.InfoS("allocated clusterIPs", "service", klog.KObj(service), "clusterIPs", allocated) }