scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

use klog.InfoS instead of klog.V(0).InfoS

Browse Source
This commit is contained in:
JunYang
2022-08-05 09:44:34 +08:00
parent 26842bb0c8
commit 2db4dea565
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-proxy/app/server.go
View File

@@ -814,7 +814,7 @@ func detectNodeIP(client clientset.Interface, hostname, bindAddress string) net.
nodeIP = utilnode.GetNodeIP(client, hostname) nodeIP = utilnode.GetNodeIP(client, hostname)
} }
if nodeIP == nil { 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") nodeIP = netutils.ParseIPSloppy("127.0.0.1")
} }
return nodeIP return nodeIP

18
cmd/kube-proxy/app/server_others.go
View File

@@ -170,22 +170,22 @@ func newProxyServer(
for _, perFamilyIpt := range ipt { for _, perFamilyIpt := range ipt {
if !perFamilyIpt.Present() { 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 dualStack = false
} }
} }
} }
if proxyMode == proxyconfigapi.ProxyModeIPTables { if proxyMode == proxyconfigapi.ProxyModeIPTables {
klog.V(0).InfoS("Using iptables Proxier") klog.InfoS("Using iptables Proxier")
if config.IPTables.MasqueradeBit == nil { if config.IPTables.MasqueradeBit == nil {
// MasqueradeBit must be specified or defaulted. // MasqueradeBit must be specified or defaulted.
return nil, fmt.Errorf("unable to read IPTables MasqueradeBit from config") return nil, fmt.Errorf("unable to read IPTables MasqueradeBit from config")
} }
if dualStack { if dualStack {
klog.V(0).InfoS("kube-proxy running in dual-stack mode", "ipFamily", iptInterface.Protocol()) klog.InfoS("kube-proxy running in dual-stack mode", "ipFamily", iptInterface.Protocol())
klog.V(0).InfoS("Creating dualStackProxier for iptables") klog.InfoS("Creating dualStackProxier for iptables")
// Always ordered to match []ipt // Always ordered to match []ipt
var localDetectors [2]proxyutiliptables.LocalTrafficDetector var localDetectors [2]proxyutiliptables.LocalTrafficDetector
localDetectors, err = getDualStackLocalDetectorTuple(detectLocalMode, config, ipt, nodeInfo) localDetectors, err = getDualStackLocalDetectorTuple(detectLocalMode, config, ipt, nodeInfo)
@@ -247,9 +247,9 @@ func newProxyServer(
} }
ipvsInterface = utilipvs.New() ipvsInterface = utilipvs.New()
klog.V(0).InfoS("Using ipvs Proxier") klog.InfoS("Using ipvs Proxier")
if dualStack { if dualStack {
klog.V(0).InfoS("Creating dualStackProxier for ipvs") klog.InfoS("Creating dualStackProxier for ipvs")
nodeIPs := nodeIPTuple(config.BindAddress) nodeIPs := nodeIPTuple(config.BindAddress)
@@ -321,8 +321,8 @@ func newProxyServer(
} }
proxymetrics.RegisterMetrics() proxymetrics.RegisterMetrics()
} else { } else {
klog.V(0).InfoS("Using userspace Proxier") klog.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("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. // TODO this has side effects that should only happen when Run() is invoked.
proxier, err = userspace.NewProxier( proxier, err = userspace.NewProxier(
@@ -453,7 +453,7 @@ func getLocalDetector(mode proxyconfigapi.LocalMode, config *proxyconfigapi.Kube
} }
return proxyutiliptables.NewDetectLocalByInterfaceNamePrefix(config.DetectLocal.InterfaceNamePrefix) 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 return proxyutiliptables.NewNoOpLocalDetector(), nil
} }

8
cmd/kube-proxy/app/server_windows.go
View File

@@ -105,9 +105,9 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, master string
proxyMode := getProxyMode(config.Mode, winkernel.WindowsKernelCompatTester{}) proxyMode := getProxyMode(config.Mode, winkernel.WindowsKernelCompatTester{})
dualStackMode := getDualStackMode(config.Winkernel.NetworkName, winkernel.DualStackCompatTester{}) dualStackMode := getDualStackMode(config.Winkernel.NetworkName, winkernel.DualStackCompatTester{})
if proxyMode == proxyconfigapi.ProxyModeKernelspace { if proxyMode == proxyconfigapi.ProxyModeKernelspace {
klog.V(0).InfoS("Using Kernelspace Proxier.") klog.InfoS("Using Kernelspace Proxier.")
if dualStackMode { if dualStackMode {
klog.V(0).InfoS("Creating dualStackProxier for Windows kernel.") klog.InfoS("Creating dualStackProxier for Windows kernel.")
proxier, err = winkernel.NewDualStackProxier( proxier, err = winkernel.NewDualStackProxier(
config.IPTables.SyncPeriod.Duration, config.IPTables.SyncPeriod.Duration,
@@ -146,8 +146,8 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, master string
winkernel.RegisterMetrics() winkernel.RegisterMetrics()
} else { } else {
klog.V(0).InfoS("Using userspace Proxier.") klog.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("The userspace proxier is now deprecated and will be removed in a future release, please use 'kernelspace' instead")
execer := exec.New() execer := exec.New()
var netshInterface utilnetsh.Interface var netshInterface utilnetsh.Interface
netshInterface = utilnetsh.New(execer) netshInterface = utilnetsh.New(execer)

2
pkg/controller/nodeipam/ipam/controller_legacyprovider.go
View File

@@ -113,7 +113,7 @@ func NewController(
// registers the informers for node changes. This will start synchronization // registers the informers for node changes. This will start synchronization
// of the node and cloud CIDR range allocations. // of the node and cloud CIDR range allocations.
func (c *Controller) Start(nodeInformer informers.NodeInformer) error { 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) nodes, err := listNodes(c.adapter.k8s)
if err != nil { if err != nil {

4
pkg/controller/podgc/gc_controller.go
View File

@@ -249,7 +249,7 @@ func (gcc *PodGCController) gcOrphaned(ctx context.Context, pods []*v1.Pod, node
if err := gcc.markFailedAndDeletePodWithCondition(ctx, pod, condition); err != nil { if err := gcc.markFailedAndDeletePodWithCondition(ctx, pod, condition); err != nil {
utilruntime.HandleError(err) utilruntime.HandleError(err)
} else { } 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 { if err := gcc.markFailedAndDeletePod(ctx, pod); err != nil {
utilruntime.HandleError(err) utilruntime.HandleError(err)
} else { } 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))
} }
} }
} }

4
pkg/registry/core/service/storage/alloc.go
View File

@@ -324,7 +324,7 @@ func (al *Allocators) txnAllocClusterIPs(service *api.Service, dryRun bool) (tra
commit: func() { commit: func() {
if !dryRun { if !dryRun {
if len(allocated) > 0 { if len(allocated) > 0 {
klog.V(0).InfoS("allocated clusterIPs", klog.InfoS("allocated clusterIPs",
"service", klog.KObj(service), "service", klog.KObj(service),
"clusterIPs", allocated) "clusterIPs", allocated)
} }
@@ -614,7 +614,7 @@ func (al *Allocators) txnUpdateClusterIPs(after After, before Before, dryRun boo
return return
} }
if len(allocated) > 0 { if len(allocated) > 0 {
klog.V(0).InfoS("allocated clusterIPs", klog.InfoS("allocated clusterIPs",
"service", klog.KObj(service), "service", klog.KObj(service),
"clusterIPs", allocated) "clusterIPs", allocated)
} }