-<<<<<<< 5313d0dfbbe54a879cad49af7aef363d3197f5cb:aci/aci-hyperkube/patches/rkt-unique-netns.patch
-From e662b81653517a2f88c60362eb681f78144d661b Mon Sep 17 00:00:00 2001
-From: JulienBalestra <julien.balestra@gmail.com>
-Date: Sat, 29 Apr 2017 18:04:39 +0200
-Subject: [PATCH 1/3] Generate a new Network Namespace for each Pod.
-=======
-From d0935f35ae743c5bc195441b07d8c743e8945053 Mon Sep 17 00:00:00 2001
+From 8608870ea8cadc335cc0694be7b3264e922afe8e Mon Sep 17 00:00:00 2001
 From: JulienBalestra <julien.balestra@gmail.com>
 Date: Sat, 29 Apr 2017 18:04:39 +0200
 Subject: [PATCH] Generate a new Network Namespace for each Pod.
->>>>>>> Non marquerading adapted by subnet:aci/aci-hyperkube/patches/45280.patch
 
 ---
  pkg/kubelet/rkt/fake_rkt_interface_test.go |  16 ++

 	} 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))
 	}
 
 	return podStatus, nil
diff --git a/pkg/kubelet/rkt/rkt_test.go b/pkg/kubelet/rkt/rkt_test.go
