controller: report default network after network deletion

When converging the desired / current state differences we must always
omit the default network, but when we are computing the current state
**after** deleting interfaces, the default network's state must always
be present.

Signed-off-by: Miguel Duarte Barroso <[email protected]>

Author: maiqueb

pkg/annotations/dynamic-network-status.go

@@ -73,13 +73,19 @@ func NamespacedName(podNamespace string, podName string) string {
 }
 
 func IndexNetworkStatus(pod *corev1.Pod) map[string]nettypes.NetworkStatus {
+	return indexNetworkStatusWithIgnorePredicate(pod, func(status nettypes.NetworkStatus) bool {
+		return false
+	})
+}
+
+func indexNetworkStatusWithIgnorePredicate(pod *corev1.Pod, p IgnoreStatusPredicate) map[string]nettypes.NetworkStatus {
 	currentPodNetworkStatus, err := PodDynamicNetworkStatus(pod)
 	if err != nil {
 		return map[string]nettypes.NetworkStatus{}
 	}
 	indexedNetworkStatus := map[string]nettypes.NetworkStatus{}
 	for i := range currentPodNetworkStatus {
-		if !currentPodNetworkStatus[i].Default {
+		if !p(currentPodNetworkStatus[i]) {
 			indexedNetworkStatus[networkStatusIndexKey(currentPodNetworkStatus[i])] = currentPodNetworkStatus[i]
 		}
 	}
@@ -92,3 +98,11 @@ func networkStatusIndexKey(networkStatus nettypes.NetworkStatus) string {
 		networkStatus.Name,
 		networkStatus.Interface)
 }
+
+type IgnoreStatusPredicate func(status nettypes.NetworkStatus) bool
+
+func IndexNetworkStatusIgnoringDefaultNetwork(pod *corev1.Pod) map[string]nettypes.NetworkStatus {
+	return indexNetworkStatusWithIgnorePredicate(pod, func(status nettypes.NetworkStatus) bool {
+		return status.Default
+	})
+}

pkg/annotations/dynamic-network-status_test.go

@@ -212,7 +212,35 @@ var _ = Describe("NetworkStatusFromResponse", func() {
 			attachmentInfo{
 				ifaceName:   "iface2",
 				networkName: "net2",
-			}))
+			}),
+		Entry(
+			"the default interface is reported when we delete another interface",
+			[]nadv1.NetworkStatus{
+				{
+					Name:      annotations.NamespacedName(namespace, networkName),
+					Interface: "iface1",
+					Mac:       "00:00:00:20:10:00",
+					Default:   true,
+				},
+				{
+					Name:      annotations.NamespacedName(namespace, "net2"),
+					Interface: "iface2",
+					Mac:       "aa:bb:cc:20:10:00",
+				},
+			},
+			[]nadv1.NetworkStatus{
+				{
+					Name:      annotations.NamespacedName(namespace, networkName),
+					Interface: "iface1",
+					Mac:       "00:00:00:20:10:00",
+					Default:   true,
+				},
+			},
+			attachmentInfo{
+				ifaceName:   "iface2",
+				networkName: "net2",
+			},
+		))
 })
 
 func newPod(podName string, namespace string, netStatus ...nadv1.NetworkStatus) *corev1.Pod {

pkg/controller/pod.go

@@ -154,7 +154,7 @@ func (pnc *PodNetworksController) processNextWorkItem() bool {
 	}
 
 	indexedNetworkSelectionElements := annotations.IndexPodNetworkSelectionElements(pod)
-	indexedNetworkStatus := annotations.IndexNetworkStatus(pod)
+	indexedNetworkStatus := annotations.IndexNetworkStatusIgnoringDefaultNetwork(pod)
 
 	netnsPath, err := pnc.netnsPath(pod)
 	if err != nil {