Bug 1389213 - Fix join/isolate project network

Pass kubeletTypes.ContainerID.ID instead of kubeletTypes.ContainerID.String() to UpdatePod(),
Otherwise docker client fails with error: no such container '://<id>'

Author: Ravi Sankar Penta

pkg/sdn/plugin/node.go

@@ -22,7 +22,6 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	kclient "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
-	kubeletTypes "k8s.io/kubernetes/pkg/kubelet/container"
 	knetwork "k8s.io/kubernetes/pkg/kubelet/network"
 	"k8s.io/kubernetes/pkg/labels"
 	kexec "k8s.io/kubernetes/pkg/util/exec"
@@ -216,7 +215,7 @@ func (node *OsdnNode) Start() error {
 		}
 		for _, p := range pods {
 			containerID := getPodContainerID(&p)
-			err = node.UpdatePod(p.Namespace, p.Name, kubeletTypes.ContainerID{ID: containerID})
+			err = node.UpdatePod(p.Namespace, p.Name, containerID)
 			if err != nil {
 				log.Warningf("Could not update pod %q (%s): %s", p.Name, containerID, err)
 			}
@@ -234,12 +233,12 @@ func (node *OsdnNode) Start() error {
 
 // FIXME: this should eventually go into kubelet via a CNI UPDATE/CHANGE action
 // See https://github.com/containernetworking/cni/issues/89
-func (node *OsdnNode) UpdatePod(namespace string, name string, id kubeletTypes.ContainerID) error {
+func (node *OsdnNode) UpdatePod(namespace string, name, id string) error {
 	req := &cniserver.PodRequest{
 		Command:      cniserver.CNI_UPDATE,
 		PodNamespace: namespace,
 		PodName:      name,
-		ContainerId:  id.String(),
+		ContainerId:  id,
 		// netns is read from docker if needed, since we don't get it from kubelet
 		Result: make(chan *cniserver.PodResult),
 	}

pkg/sdn/plugin/vnids_node.go

@@ -9,7 +9,6 @@ import (
 
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/cache"
-	kubetypes "k8s.io/kubernetes/pkg/kubelet/container"
 	kerrors "k8s.io/kubernetes/pkg/util/errors"
 	"k8s.io/kubernetes/pkg/util/sets"
 	utilwait "k8s.io/kubernetes/pkg/util/wait"
@@ -167,7 +166,7 @@ func (node *OsdnNode) updatePodNetwork(namespace string, oldNetID, netID uint32)
 
 	// Update OF rules for the existing/old pods in the namespace
 	for _, pod := range pods {
-		err = node.UpdatePod(pod.Namespace, pod.Name, kubetypes.ContainerID{ID: getPodContainerID(&pod)})
+		err = node.UpdatePod(pod.Namespace, pod.Name, getPodContainerID(&pod))
 		if err != nil {
 			errList = append(errList, err)
 		}