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

Merge pull request #101410 from songxiao-wang87/run-test5

Browse Source 
Structured Logging migration: modify server_windows part logs of kube-proxy.
This commit is contained in:
Kubernetes Prow Robot 2021-04-27 14:53:39 -07:00 committed by GitHub
commit 3d5ebcc37f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,10 +104,10 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExi
proxyMode := getProxyMode(string(config.Mode), winkernel.WindowsKernelCompatTester{}) proxyMode := getProxyMode(string(config.Mode), winkernel.WindowsKernelCompatTester{})
if proxyMode == proxyModeKernelspace { if proxyMode == proxyModeKernelspace {
klog.V(0).Info("Using Kernelspace Proxier.") klog.V(0).InfoS("Using Kernelspace Proxier.")
isIPv6DualStackEnabled := utilfeature.DefaultFeatureGate.Enabled(features.IPv6DualStack) isIPv6DualStackEnabled := utilfeature.DefaultFeatureGate.Enabled(features.IPv6DualStack)
if isIPv6DualStackEnabled { if isIPv6DualStackEnabled {
klog.V(0).Info("creating dualStackProxier for Windows kernel.") klog.V(0).InfoS("Creating dualStackProxier for Windows kernel.")
proxier, err = winkernel.NewDualStackProxier( proxier, err = winkernel.NewDualStackProxier(
config.IPTables.SyncPeriod.Duration, config.IPTables.SyncPeriod.Duration,
@ -142,7 +142,7 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExi
return nil, fmt.Errorf("unable to create proxier: %v", err) return nil, fmt.Errorf("unable to create proxier: %v", err)
} }
} else { } else {
klog.V(0).Info("Using userspace Proxier.") klog.V(0).InfoS("Using userspace Proxier.")
execer := exec.New() execer := exec.New()
var netshInterface utilnetsh.Interface var netshInterface utilnetsh.Interface
netshInterface = utilnetsh.New(execer) netshInterface = utilnetsh.New(execer)
@ -201,14 +201,14 @@ func tryWinKernelSpaceProxy(kcompat winkernel.KernelCompatTester) string {
// guaranteed false on error, error only necessary for debugging // guaranteed false on error, error only necessary for debugging
useWinKernelProxy, err := winkernel.CanUseWinKernelProxier(kcompat) useWinKernelProxy, err := winkernel.CanUseWinKernelProxier(kcompat)
if err != nil { if err != nil {
klog.Errorf("Can't determine whether to use windows kernel proxy, using userspace proxier: %v", err) klog.ErrorS(err, "Can't determine whether to use windows kernel proxy, using userspace proxier")
return proxyModeUserspace return proxyModeUserspace
} }
if useWinKernelProxy { if useWinKernelProxy {
return proxyModeKernelspace return proxyModeKernelspace
} }
// Fallback. // Fallback.
klog.V(1).Infof("Can't use winkernel proxy, using userspace proxier") klog.V(1).InfoS("Can't use winkernel proxy, using userspace proxier")
return proxyModeUserspace return proxyModeUserspace
} }