Merge pull request #42876 from timchenxiaoyu/accuratehint

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

Merge pull request #42876 from timchenxiaoyu/accuratehint
7629bffb · Kubernetes Submit Queue · GitHub · d1dd73e9 · c2955144 · 7629bffb
Commit 7629bffb authored Mar 30, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cni.go pkg/kubelet/network/cni/cni.go +2 -2

No files found.
--- a/pkg/kubelet/network/cni/cni.go
+++ b/pkg/kubelet/network/cni/cni.go
@@ -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
 	}