ip-reconciler: Add all non default interfaces to Pod IP list

platform9 · Sep 21, 2021 · 4b33f0d · 4b33f0d
1 parent 3dacc67
commit 4b33f0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/pkg/reconciler/wrappedPod.go b/pkg/reconciler/wrappedPod.go
@@ -71,10 +71,9 @@ func getFlatIPSet(pod v1.Pod) map[string]void {
 			continue
 		}
 
-		if network.Interface[:multusPrefixSize] == multusInterfaceNamePrefix {
-			for _, ip := range network.IPs {
-				ipSet[ip] = empty
-			}
+		for _, ip := range network.IPs {
+			ipSet[ip] = empty
+			logging.Debugf("Added IP %s for pod %s", ip, composePodRef(pod))
 		}
 	}
 	return ipSet

diff --git a/pkg/reconciler/wrappedPod_test.go b/pkg/reconciler/wrappedPod_test.go
@@ -114,23 +114,6 @@ var _ = Describe("Pod Wrapper operations", func() {
 			Expect(podSecondaryIPs).To(Equal(map[string]void{"192.168.14.14": {}, "10.10.10.10": {}}))
 		})
 
-		It("should filter out non-multus annotations", func() {
-			secondaryIfacesNetworkStatuses := generateMultusNetworkStatusList("192.168.14.14", "10.10.10.10")
-
-			networkStatus := append(
-				secondaryIfacesNetworkStatuses,
-				generateMultusNetworkStatus("eth0", "network33", "14.15.16.20"))
-			pod := v1.Pod{
-				ObjectMeta: metav1.ObjectMeta{
-					Annotations: generateMultusNetworkStatusAnnotationFromNetworkStatus(networkStatus...),
-				},
-			}
-
-			podSecondaryIPs := wrapPod(pod).ips
-			Expect(podSecondaryIPs).To(HaveLen(2))
-			Expect(podSecondaryIPs).To(Equal(map[string]void{"192.168.14.14": {}, "10.10.10.10": {}}))
-		})
-
 		It("return an empty list when the network annotations of a pod are invalid", func() {
 			pod := v1.Pod{
 				ObjectMeta: metav1.ObjectMeta{