github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42876 from timchenxiaoyu/accuratehint

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42379, 42668, 42876, 41473, 43260)

accurate hint

accurate hint

same err hint (Error adding network) in one method,cann't position problem
This commit is contained in:
Kubernetes Submit Queue 2017-03-30 23:36:26 -07:00 committed by GitHub
commit 7629bffba2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/network/cni/cni.go
View File

@ -246,7 +246,7 @@ func (plugin *cniNetworkPlugin) GetPodNetworkStatus(namespace string, name strin
func (network *cniNetwork) addToNetwork(podName string, podNamespace string, podInfraContainerID kubecontainer.ContainerID, podNetnsPath string) (*cnitypes.Result, error) {
rt, err := buildCNIRuntimeConf(podName, podNamespace, podInfraContainerID, podNetnsPath)
if err != nil {
glog.Errorf("Error adding network: %v", err)
glog.Errorf("Error adding network when buliding cni runtime conf: %v", err)
return nil, err
}
@ -264,7 +264,7 @@ func (network *cniNetwork) addToNetwork(podName string, podNamespace string, pod
func (network *cniNetwork) deleteFromNetwork(podName string, podNamespace string, podInfraContainerID kubecontainer.ContainerID, podNetnsPath string) error {
rt, err := buildCNIRuntimeConf(podName, podNamespace, podInfraContainerID, podNetnsPath)
if err != nil {
glog.Errorf("Error deleting network: %v", err)
glog.Errorf("Error deleting network when buliding cni runtime conf: %v", err)
return err
}