github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67888 from tanshanshan/glogformat

Browse Source 
remove unused format log print
This commit is contained in:
k8s-ci-robot 2018-10-01 22:20:28 -07:00 committed by GitHub
commit 941fc26418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/proxy/config/config.go
View File

@ -207,7 +207,7 @@ func (c *ServiceConfig) Run(stopCh <-chan struct{}) {
} }
for i := range c.eventHandlers { for i := range c.eventHandlers {
glog.V(3).Infof("Calling handler.OnServiceSynced()") glog.V(3).Info("Calling handler.OnServiceSynced()")
c.eventHandlers[i].OnServiceSynced() c.eventHandlers[i].OnServiceSynced()
} }
@ -221,7 +221,7 @@ func (c *ServiceConfig) handleAddService(obj interface{}) {
return return
} }
for i := range c.eventHandlers { for i := range c.eventHandlers {
glog.V(4).Infof("Calling handler.OnServiceAdd") glog.V(4).Info("Calling handler.OnServiceAdd")
c.eventHandlers[i].OnServiceAdd(service) c.eventHandlers[i].OnServiceAdd(service)
} }
} }
@ -238,7 +238,7 @@ func (c *ServiceConfig) handleUpdateService(oldObj, newObj interface{}) {
return return
} }
for i := range c.eventHandlers { for i := range c.eventHandlers {
glog.V(4).Infof("Calling handler.OnServiceUpdate") glog.V(4).Info("Calling handler.OnServiceUpdate")
c.eventHandlers[i].OnServiceUpdate(oldService, service) c.eventHandlers[i].OnServiceUpdate(oldService, service)
} }
} }
@ -257,7 +257,7 @@ func (c *ServiceConfig) handleDeleteService(obj interface{}) {
} }
} }
for i := range c.eventHandlers { for i := range c.eventHandlers {
glog.V(4).Infof("Calling handler.OnServiceDelete") glog.V(4).Info("Calling handler.OnServiceDelete")
c.eventHandlers[i].OnServiceDelete(service) c.eventHandlers[i].OnServiceDelete(service)
} }
} }

2
pkg/proxy/healthcheck/healthcheck.go
View File

@ -322,7 +322,7 @@ func (hs *HealthzServer) Run() {
glog.Errorf("Healthz closed with error: %v", err) glog.Errorf("Healthz closed with error: %v", err)
return return
} }
glog.Errorf("Unexpected healthz closed.") glog.Error("Unexpected healthz closed.")
}, nodeHealthzRetryInterval, wait.NeverStop) }, nodeHealthzRetryInterval, wait.NeverStop)
} }

10
pkg/proxy/iptables/proxier.go
View File

@ -182,7 +182,7 @@ func newEndpointInfo(baseInfo *proxy.BaseEndpointInfo) proxy.Endpoint {
func (e *endpointsInfo) Equal(other proxy.Endpoint) bool { func (e *endpointsInfo) Equal(other proxy.Endpoint) bool {
o, ok := other.(*endpointsInfo) o, ok := other.(*endpointsInfo)
if !ok { if !ok {
glog.Errorf("Failed to cast endpointsInfo") glog.Error("Failed to cast endpointsInfo")
return false return false
} }
return e.Endpoint == o.Endpoint && return e.Endpoint == o.Endpoint &&
@ -303,7 +303,7 @@ func NewProxier(ipt utiliptables.Interface,
// are connected to a Linux bridge (but not SDN bridges). Until most // are connected to a Linux bridge (but not SDN bridges). Until most
// plugins handle this, log when config is missing // plugins handle this, log when config is missing
if val, err := sysctl.GetSysctl(sysctlBridgeCallIPTables); err == nil && val != 1 { if val, err := sysctl.GetSysctl(sysctlBridgeCallIPTables); err == nil && val != 1 {
glog.Warningf("missing br-netfilter module or unset sysctl br-nf-call-iptables; proxy may not work as intended") glog.Warning("missing br-netfilter module or unset sysctl br-nf-call-iptables; proxy may not work as intended")
} }
// Generate the masquerade mark to use for SNAT rules. // Generate the masquerade mark to use for SNAT rules.
@ -311,12 +311,12 @@ func NewProxier(ipt utiliptables.Interface,
masqueradeMark := fmt.Sprintf("%#08x/%#08x", masqueradeValue, masqueradeValue) masqueradeMark := fmt.Sprintf("%#08x/%#08x", masqueradeValue, masqueradeValue)
if nodeIP == nil { if nodeIP == nil {
glog.Warningf("invalid nodeIP, initializing kube-proxy with 127.0.0.1 as nodeIP") glog.Warning("invalid nodeIP, initializing kube-proxy with 127.0.0.1 as nodeIP")
nodeIP = net.ParseIP("127.0.0.1") nodeIP = net.ParseIP("127.0.0.1")
} }
if len(clusterCIDR) == 0 { if len(clusterCIDR) == 0 {
glog.Warningf("clusterCIDR not specified, unable to distinguish between internal and external traffic") glog.Warning("clusterCIDR not specified, unable to distinguish between internal and external traffic")
} else if utilnet.IsIPv6CIDR(clusterCIDR) != ipt.IsIpv6() { } else if utilnet.IsIPv6CIDR(clusterCIDR) != ipt.IsIpv6() {
return nil, fmt.Errorf("clusterCIDR %s has incorrect IP version: expect isIPv6=%t", clusterCIDR, ipt.IsIpv6()) return nil, fmt.Errorf("clusterCIDR %s has incorrect IP version: expect isIPv6=%t", clusterCIDR, ipt.IsIpv6())
} }
@ -661,7 +661,7 @@ func (proxier *Proxier) syncProxyRules() {
} }
} }
glog.V(3).Infof("Syncing iptables rules") glog.V(3).Info("Syncing iptables rules")
// Create and link the kube chains. // Create and link the kube chains.
for _, chain := range iptablesJumpChains { for _, chain := range iptablesJumpChains {