mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #99996 from learner0810/master
logcheck: check Windows files
This commit is contained in:
commit
fcee7a0105
@ -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
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user