  	} else {
 -		containerID := kubecontainer.ContainerID{ID: string(uid)}
 -		status, err := r.network.GetPodNetworkStatus(namespace, name, containerID)
-<<<<<<< 5313d0dfbbe54a879cad49af7aef363d3197f5cb:aci/aci-hyperkube/patches/rkt-unique-netns.patch
-+		networkNamespace, err := r.getNetworkNamespaceFromRunningUnitFiles(uid)
-+		if err != nil {
-+			glog.Warningf("networkNamespace: %v", err)
-+		}
-+		status, err := r.network.GetPodNetworkStatus(namespace, name, networkNamespace)
- 		if err != nil {
- 			glog.Warningf("rkt: %v", err)
- 		} else if status != nil {
--- 
-2.7.4
-
-
-From e15303203a2804a67abb92d8d5d76121f8ef5da2 Mon Sep 17 00:00:00 2001
-From: JulienBalestra <julien.balestra@gmail.com>
-Date: Mon, 1 May 2017 22:49:27 +0200
-Subject: [PATCH 2/3] Use the rkt Pod ID instead to find the corresponding
- systemd unit file
-
----
- pkg/kubelet/rkt/rkt.go | 31 ++++++-------------------------
- 1 file changed, 6 insertions(+), 25 deletions(-)
-
-diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go
-index 2e7426b..ba043d1 100644
---- a/pkg/kubelet/rkt/rkt.go
-+++ b/pkg/kubelet/rkt/rkt.go
-@@ -2343,39 +2343,20 @@ func populateContainerStatus(pod rktapi.Pod, app rktapi.App, runtimeApp appcsche
- 	}, nil
- }
-=======
 -		if err != nil {
 -			glog.Warningf("rkt: %v", err)
 -		} else if status != nil {

-		}
+		glog.Warningf("No latestPod: rkt api-svc returns [%d]rktPods, cannot fill podStatus.IP", len(listResp.Pods))
 	}
>>>>>>> Non marquerading adapted by subnet:aci/aci-hyperkube/patches/45280.patch
 
 	return podStatus, nil
diff --git a/pkg/kubelet/rkt/rkt_test.go b/pkg/kubelet/rkt/rkt_test.go

-- 
2.7.4

