scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-30 17:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45446 from zdj6373/cni

Browse Source 
Automatic merge from submit-queue

cni Log changes

Newly modified log error, modified
This commit is contained in:
Kubernetes Submit Queue
2017-05-09 14:23:32 -07:00
committed by GitHub
parent b60d322c27 aa86d7734b
commit aee07e9464
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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