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

Merge pull request #99996 from learner0810/master

Browse Source 
logcheck: check Windows files
This commit is contained in:
Kubernetes Prow Robot 2021-03-12 00:12:18 -08:00 committed by GitHub
commit fcee7a0105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/verify-structured-logging.sh
View File

@ -52,7 +52,8 @@ done < <(cat "${migrated_packages_file}")
# TODO: Improve concurrancy here # TODO: Improve concurrancy here
ret=0 ret=0
for package in "${migrated_packages[@]}"; do 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 done
if [ $ret -eq 0 ]; then if [ $ret -eq 0 ]; then

6
pkg/kubelet/dockershim/network/cni/cni_windows.go
View File

@ -54,9 +54,9 @@ func (plugin *cniNetworkPlugin) GetPodNetworkStatus(namespace string, name strin
cniTimeoutCtx, cancelFunc := context.WithTimeout(context.Background(), network.CNITimeoutSec*time.Second) cniTimeoutCtx, cancelFunc := context.WithTimeout(context.Background(), network.CNITimeoutSec*time.Second)
defer cancelFunc() defer cancelFunc()
result, err := plugin.addToNetwork(cniTimeoutCtx, plugin.getDefaultNetwork(), name, namespace, id, netnsPath, nil, nil) 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 { 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 return nil, err
} }
@ -64,7 +64,7 @@ func (plugin *cniNetworkPlugin) GetPodNetworkStatus(namespace string, name strin
var result020 *cniTypes020.Result var result020 *cniTypes020.Result
result020, err = cniTypes020.GetResult(result) result020, err = cniTypes020.GetResult(result)
if err != nil { if err != nil {
klog.Errorf("error while cni parsing result: %s", err) klog.ErrorS(err, "Got error while cni parsing result")
return nil, err return nil, err
} }