From 5449ce7c5c9c3ed0e96b8b078c6c07a346b2891f Mon Sep 17 00:00:00 2001 From: Alkaid <38248129+jyz0309@users.noreply.github.com> Date: Wed, 15 Sep 2021 11:50:40 +0800 Subject: [PATCH] Migrate `cmd/proxy/app` and `pkg/proxy/meta_proxier` to structured logging (#104928) * migrate log Signed-off-by: jyz0309 <45495947@qq.com> * remove useless change Signed-off-by: jyz0309 <45495947@qq.com> fix comment Signed-off-by: jyz0309 <45495947@qq.com> fix comment Signed-off-by: jyz0309 <45495947@qq.com> * use nil to instead err Signed-off-by: jyz0309 <45495947@qq.com> * fix comment Signed-off-by: jyz0309 <45495947@qq.com> * remove useless change Signed-off-by: jyz0309 <45495947@qq.com> * resolve conflict Signed-off-by: jyz0309 <45495947@qq.com> * resolve conflict Signed-off-by: jyz0309 <45495947@qq.com> * fix comment Signed-off-by: jyz0309 <45495947@qq.com> * fix comment Signed-off-by: jyz0309 <45495947@qq.com> * fix comment Signed-off-by: jyz0309 <45495947@qq.com> --- cmd/kube-proxy/app/server_others.go | 4 ++-- pkg/proxy/metaproxier/meta_proxier.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go index 283dc2bef43..399c4261c2e 100644 --- a/cmd/kube-proxy/app/server_others.go +++ b/cmd/kube-proxy/app/server_others.go @@ -203,9 +203,9 @@ func newProxyServer( } } if dualStack { - klog.V(0).Infof("kube-proxy running in dual-stack mode, %s-primary", iptInterface.Protocol()) + klog.V(0).InfoS("kube-proxy running in dual-stack mode", "ipFamily", iptInterface.Protocol()) } else { - klog.V(0).Infof("kube-proxy running in single-stack %s mode", iptInterface.Protocol()) + klog.V(0).InfoS("kube-proxy running in single-stack mode", "ipFamily", iptInterface.Protocol()) } if proxyMode == proxyModeIPTables { diff --git a/pkg/proxy/metaproxier/meta_proxier.go b/pkg/proxy/metaproxier/meta_proxier.go index 261b9214f84..f8053deb583 100644 --- a/pkg/proxy/metaproxier/meta_proxier.go +++ b/pkg/proxy/metaproxier/meta_proxier.go @@ -94,7 +94,7 @@ func (proxier *metaProxier) OnEndpointSliceAdd(endpointSlice *discovery.Endpoint case discovery.AddressTypeIPv6: proxier.ipv6Proxier.OnEndpointSliceAdd(endpointSlice) default: - klog.V(4).Infof("EndpointSlice address type not supported by kube-proxy: %s", endpointSlice.AddressType) + klog.ErrorS(nil, "EndpointSlice address type not supported", "addressType", endpointSlice.AddressType) } } @@ -107,7 +107,7 @@ func (proxier *metaProxier) OnEndpointSliceUpdate(oldEndpointSlice, newEndpointS case discovery.AddressTypeIPv6: proxier.ipv6Proxier.OnEndpointSliceUpdate(oldEndpointSlice, newEndpointSlice) default: - klog.V(4).Infof("EndpointSlice address type not supported by kube-proxy: %s", newEndpointSlice.AddressType) + klog.ErrorS(nil, "EndpointSlice address type not supported", "addressType", newEndpointSlice.AddressType) } } @@ -120,7 +120,7 @@ func (proxier *metaProxier) OnEndpointSliceDelete(endpointSlice *discovery.Endpo case discovery.AddressTypeIPv6: proxier.ipv6Proxier.OnEndpointSliceDelete(endpointSlice) default: - klog.V(4).Infof("EndpointSlice address type not supported by kube-proxy: %s", endpointSlice.AddressType) + klog.ErrorS(nil, "EndpointSlice address type not supported", "addressType", endpointSlice.AddressType) } }