From cbc0d559120683f07e0245362cde6be1e9168e47 Mon Sep 17 00:00:00 2001 From: "zhongjun.li" Date: Thu, 11 Mar 2021 17:40:07 +0800 Subject: [PATCH] logcheck: check Windows files --- hack/verify-structured-logging.sh | 3 ++- pkg/kubelet/dockershim/network/cni/cni_windows.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hack/verify-structured-logging.sh b/hack/verify-structured-logging.sh index 4395cdfc52d..30f21b95a90 100755 --- a/hack/verify-structured-logging.sh +++ b/hack/verify-structured-logging.sh @@ -52,7 +52,8 @@ done < <(cat "${migrated_packages_file}") # TODO: Improve concurrancy here ret=0 for package in "${migrated_packages[@]}"; do - logcheck "$KUBE_ROOT/$package" || ret=$? + GOOS=linux logcheck "$KUBE_ROOT/$package" || ret=$? + GOOS=windows logcheck "$KUBE_ROOT/$package" || ret=$? done if [ $ret -eq 0 ]; then diff --git a/pkg/kubelet/dockershim/network/cni/cni_windows.go b/pkg/kubelet/dockershim/network/cni/cni_windows.go index e76f69816c9..e9952ddb983 100644 --- a/pkg/kubelet/dockershim/network/cni/cni_windows.go +++ b/pkg/kubelet/dockershim/network/cni/cni_windows.go @@ -54,9 +54,9 @@ func (plugin *cniNetworkPlugin) GetPodNetworkStatus(namespace string, name strin cniTimeoutCtx, cancelFunc := context.WithTimeout(context.Background(), network.CNITimeoutSec*time.Second) defer cancelFunc() result, err := plugin.addToNetwork(cniTimeoutCtx, plugin.getDefaultNetwork(), name, namespace, id, netnsPath, nil, nil) - klog.V(5).Infof("GetPodNetworkStatus result %+v", result) + klog.V(5).InfoS("GetPodNetworkStatus", "result", result) if err != nil { - klog.Errorf("error while adding to cni network: %s", err) + klog.ErrorS(err, "Got error while adding to cni network") return nil, err } @@ -64,7 +64,7 @@ func (plugin *cniNetworkPlugin) GetPodNetworkStatus(namespace string, name strin var result020 *cniTypes020.Result result020, err = cniTypes020.GetResult(result) if err != nil { - klog.Errorf("error while cni parsing result: %s", err) + klog.ErrorS(err, "Got error while cni parsing result") return nil, err }