Add partition wise network peering status in apinetlet

ironcore-dev · Oct 1, 2024 · da8fdf1 · da8fdf1
1 parent b0b74d6
commit da8fdf1
Show file tree

Hide file tree

Showing 15 changed files with 101 additions and 77 deletions.
diff --git a/api/core/v1alpha1/network_types.go b/api/core/v1alpha1/network_types.go
@@ -36,7 +36,7 @@ type PeeringPrefix struct {
 
 type NetworkStatus struct {
 	// Peerings contains the states of the network peerings for the network.
-	Peerings []NetworkPeeringStatus `json:"peerings,omitempty"`
+	Peerings map[string][]NetworkPeeringStatus `json:"peerings,omitempty"`
 }
 
 // NetworkState is the state of a network.

diff --git a/api/core/v1alpha1/zz_generated.deepcopy.go b/api/core/v1alpha1/zz_generated.deepcopy.go
diff --git a/apinetlet/controllers/conversion.go b/apinetlet/controllers/conversion.go
@@ -80,27 +80,32 @@ func apiNetNetworkInterfaceStateToNetworkInterfaceState(state apinetv1alpha1.Net
 	}
 }
 
-func apiNetNetworkPeeringsStatusToNetworkPeeringsStatus(peerings []apinetv1alpha1.NetworkPeeringStatus, specPeerings []apinetv1alpha1.NetworkPeering) []networkingv1alpha1.NetworkPeeringStatus {
+func apiNetNetworkPeeringsStatusToNetworkPeeringsStatus(partitionPeeringsMap map[string][]apinetv1alpha1.NetworkPeeringStatus, specPeerings []apinetv1alpha1.NetworkPeering) []networkingv1alpha1.NetworkPeeringStatus {
 	var networkPeeringsStatus []networkingv1alpha1.NetworkPeeringStatus
-	for _, peering := range peerings {
-		idx := slices.IndexFunc(specPeerings, func(specPeering apinetv1alpha1.NetworkPeering) bool {
-			return specPeering.ID == strconv.Itoa(int(peering.ID))
-		})
-		if idx != -1 {
-			var prefixStatus []networkingv1alpha1.PeeringPrefixStatus
-			if peering.State == apinetv1alpha1.NetworkPeeringStateReady {
-				for _, peeringPrefix := range specPeerings[idx].Prefixes {
-					prefixStatus = append(prefixStatus, networkingv1alpha1.PeeringPrefixStatus{
-						Name:   peeringPrefix.Name,
-						Prefix: (*commonv1alpha1.IPPrefix)(peeringPrefix.Prefix),
-					})
+	for _, peerings := range partitionPeeringsMap {
+		if len(peerings) == 0 {
+			continue
+		}
+		for _, peering := range peerings {
+			idx := slices.IndexFunc(specPeerings, func(specPeering apinetv1alpha1.NetworkPeering) bool {
+				return specPeering.ID == strconv.Itoa(int(peering.ID))
+			})
+			if idx != -1 {
+				var prefixStatus []networkingv1alpha1.PeeringPrefixStatus
+				if peering.State == apinetv1alpha1.NetworkPeeringStateReady {
+					for _, peeringPrefix := range specPeerings[idx].Prefixes {
+						prefixStatus = append(prefixStatus, networkingv1alpha1.PeeringPrefixStatus{
+							Name:   peeringPrefix.Name,
+							Prefix: (*commonv1alpha1.IPPrefix)(peeringPrefix.Prefix),
+						})
+					}
 				}
+				networkPeeringsStatus = append(networkPeeringsStatus, networkingv1alpha1.NetworkPeeringStatus{
+					Name:     specPeerings[idx].Name,
+					State:    networkingv1alpha1.NetworkPeeringState(peering.State),
+					Prefixes: prefixStatus,
+				})
 			}
-			networkPeeringsStatus = append(networkPeeringsStatus, networkingv1alpha1.NetworkPeeringStatus{
-				Name:     specPeerings[idx].Name,
-				State:    networkingv1alpha1.NetworkPeeringState(peering.State),
-				Prefixes: prefixStatus,
-			})
 		}
 	}
 	return networkPeeringsStatus

diff --git a/apinetlet/controllers/network_controller.go b/apinetlet/controllers/network_controller.go
@@ -248,10 +248,7 @@ func (r *NetworkReconciler) applyAPINetNetwork(ctx context.Context, log logr.Log
 			})
 		}
 	}
-	// apiNetNetwork.Spec.Peerings = peerings
 
-	log.V(1).Info("APINet network spec peerings", "old", apiNetNetwork.Spec.Peerings, "new", peerings)
-	log.V(1).Info("APINet network status", "old", apiNetNetwork.Status.Peerings)
 	isPeeringsEqual := equality.Semantic.DeepEqual(apiNetNetwork.Spec.Peerings, peerings)
 
 	if !isNetworkExist || !isPeeringsEqual {

diff --git a/apinetlet/controllers/network_controller_test.go b/apinetlet/controllers/network_controller_test.go
@@ -201,15 +201,15 @@ var _ = Describe("NetworkController", func() {
 		By("patching apinet network peering status")
 		apiNetNetwork2ID, _ := strconv.Atoi(apiNetNetwork2.Spec.ID)
 		Eventually(UpdateStatus(apiNetNetwork1, func() {
-			apiNetNetwork1.Status.Peerings = []apinetv1alpha1.NetworkPeeringStatus{{
+			apiNetNetwork1.Status.Peerings["partition1"] = []apinetv1alpha1.NetworkPeeringStatus{{
 				ID:    int32(apiNetNetwork2ID),
 				State: apinetv1alpha1.NetworkPeeringStateReady,
 			}}
 		})).Should(Succeed())
 
 		apiNetNetwork1ID, _ := strconv.Atoi(apiNetNetwork1.Spec.ID)
 		Eventually(UpdateStatus(apiNetNetwork2, func() {
-			apiNetNetwork2.Status.Peerings = []apinetv1alpha1.NetworkPeeringStatus{{
+			apiNetNetwork2.Status.Peerings["partition1"] = []apinetv1alpha1.NetworkPeeringStatus{{
 				ID:    int32(apiNetNetwork1ID),
 				State: apinetv1alpha1.NetworkPeeringStateReady,
 			}}
@@ -377,15 +377,15 @@ var _ = Describe("NetworkController", func() {
 		By("patching apinet network peering status")
 		apiNetNetwork2ID, _ := strconv.Atoi(apiNetNetwork2.Spec.ID)
 		Eventually(UpdateStatus(apiNetNetwork1, func() {
-			apiNetNetwork1.Status.Peerings = []apinetv1alpha1.NetworkPeeringStatus{{
+			apiNetNetwork1.Status.Peerings["partition1"] = []apinetv1alpha1.NetworkPeeringStatus{{
 				ID:    int32(apiNetNetwork2ID),
 				State: apinetv1alpha1.NetworkPeeringStateReady,
 			}}
 		})).Should(Succeed())
 
 		apiNetNetwork1ID, _ := strconv.Atoi(apiNetNetwork1.Spec.ID)
 		Eventually(UpdateStatus(apiNetNetwork2, func() {
-			apiNetNetwork2.Status.Peerings = []apinetv1alpha1.NetworkPeeringStatus{{
+			apiNetNetwork2.Status.Peerings["partition1"] = []apinetv1alpha1.NetworkPeeringStatus{{
 				ID:    int32(apiNetNetwork1ID),
 				State: apinetv1alpha1.NetworkPeeringStateReady,
 			}}

diff --git a/client-go/applyconfigurations/core/v1alpha1/networkstatus.go b/client-go/applyconfigurations/core/v1alpha1/networkstatus.go
diff --git a/client-go/applyconfigurations/internal/internal.go b/client-go/applyconfigurations/internal/internal.go
diff --git a/client-go/openapi/api_violations.report b/client-go/openapi/api_violations.report
@@ -29,7 +29,6 @@ API rule violation: list_type_missing,github.com/ironcore-dev/ironcore-net/api/c
 API rule violation: list_type_missing,github.com/ironcore-dev/ironcore-net/api/core/v1alpha1,NetworkPolicySpec,Ingress
 API rule violation: list_type_missing,github.com/ironcore-dev/ironcore-net/api/core/v1alpha1,NetworkPolicySpec,PolicyTypes
 API rule violation: list_type_missing,github.com/ironcore-dev/ironcore-net/api/core/v1alpha1,NetworkSpec,Peerings
-API rule violation: list_type_missing,github.com/ironcore-dev/ironcore-net/api/core/v1alpha1,NetworkStatus,Peerings
 API rule violation: list_type_missing,github.com/ironcore-dev/ironcore-net/api/core/v1alpha1,NodeSelector,NodeSelectorTerms
 API rule violation: list_type_missing,github.com/ironcore-dev/ironcore-net/api/core/v1alpha1,NodeSelectorRequirement,Values
 API rule violation: list_type_missing,github.com/ironcore-dev/ironcore-net/api/core/v1alpha1,NodeSelectorTerm,MatchExpressions

diff --git a/client-go/openapi/zz_generated.openapi.go b/client-go/openapi/zz_generated.openapi.go
diff --git a/docs/api-reference/core.md b/docs/api-reference/core.md
@@ -1556,7 +1556,7 @@ LocalUIDReference
 </em>
 </td>
 <td>
-<p>NetworkRef is the network the load balancer is assigned to.</p>
+<p>NetworkRef is the network to which network policy is applied.</p>
 </td>
 </tr>
 <tr>
@@ -3800,9 +3800,6 @@ to the peered network, if no prefixes are specified no filtering will be done.</
 </table>
 <h3 id="core.apinet.ironcore.dev/v1alpha1.NetworkPeeringStatus">NetworkPeeringStatus
 </h3>
-<p>
-(<em>Appears on:</em><a href="#core.apinet.ironcore.dev/v1alpha1.NetworkStatus">NetworkStatus</a>)
-</p>
 <div>
 <p>NetworkPeeringStatus is the status of a network peering.</p>
 </div>
@@ -4201,8 +4198,8 @@ string
 <td>
 <code>peerings</code><br/>
 <em>
-<a href="#core.apinet.ironcore.dev/v1alpha1.NetworkPeeringStatus">
-[]NetworkPeeringStatus
+<a href="#core.apinet.ironcore.dev/v1alpha1.[]ironcore-net/api/core/v1alpha1.NetworkPeeringStatus">
+map[string][]ironcore-net/api/core/v1alpha1.NetworkPeeringStatus
 </a>
 </em>
 </td>
@@ -4570,7 +4567,7 @@ string
 (<em>Appears on:</em><a href="#core.apinet.ironcore.dev/v1alpha1.NetworkPeering">NetworkPeering</a>)
 </p>
 <div>
-<p>PeeringPrefixes defines prefixes to be exposed to the peered network</p>
+<p>PeeringPrefix defines prefixes to be exposed to the peered network</p>
 </div>
 <table>
 <thead>

diff --git a/internal/apis/core/network_types.go b/internal/apis/core/network_types.go
@@ -35,7 +35,7 @@ type PeeringPrefix struct {
 }
 type NetworkStatus struct {
 	// Peerings contains the states of the network peerings for the network.
-	Peerings []NetworkPeeringStatus
+	Peerings map[string][]NetworkPeeringStatus
 }
 
 // NetworkState is the state of a network.

diff --git a/internal/apis/core/v1alpha1/zz_generated.conversion.go b/internal/apis/core/v1alpha1/zz_generated.conversion.go
diff --git a/internal/apis/core/zz_generated.deepcopy.go b/internal/apis/core/zz_generated.deepcopy.go
diff --git a/metalnetlet/controllers/network_controller.go b/metalnetlet/controllers/network_controller.go
@@ -114,12 +114,14 @@ func (r *NetworkReconciler) delete(ctx context.Context, log logr.Logger, network
 }
 
 func (r *NetworkReconciler) updateApinetNetworkStatus(ctx context.Context, log logr.Logger, network *apinetv1alpha1.Network, metalnetNetwork *metalnetv1alpha1.Network) error {
-	newStatusPeerings := metalnetNetworkPeeringsStatusToNetworkPeeringsStatus(metalnetNetwork.Status.Peerings)
-	log.V(1).Info("apinet status", "old", network.Status.Peerings, "new", newStatusPeerings)
-	if !equality.Semantic.DeepEqual(network.Status.Peerings, newStatusPeerings) {
-		log.V(1).Info("Patching apinet network status", "status", newStatusPeerings)
+	apinetStatusPeerings := metalnetNetworkPeeringsStatusToNetworkPeeringsStatus(metalnetNetwork.Status.Peerings)
+	if !equality.Semantic.DeepEqual(network.Status.Peerings[r.PartitionName], apinetStatusPeerings) {
+		log.V(1).Info("Patching apinet network status", "status", apinetStatusPeerings)
 		networkBase := network.DeepCopy()
-		network.Status.Peerings = newStatusPeerings
+		if network.Status.Peerings == nil {
+			network.Status.Peerings = make(map[string][]apinetv1alpha1.NetworkPeeringStatus, 0)
+		}
+		network.Status.Peerings[r.PartitionName] = apinetStatusPeerings
 		if err := r.Status().Patch(ctx, network, client.MergeFrom(networkBase)); err != nil {
 			return fmt.Errorf("unable to patch network: %w", err)
 		}
@@ -219,7 +221,6 @@ func (r *NetworkReconciler) reconcile(ctx context.Context, log logr.Logger, netw
 	}
 
 	log.V(1).Info("Updating apinet network status")
-	log.V(1).Info("network status", "apinet", network.Status, "metalnet", metalnetNetwork.Status)
 	if err := r.updateApinetNetworkStatus(ctx, log, network, metalnetNetwork); err != nil {
 		return ctrl.Result{}, fmt.Errorf("error updating apinet networkstatus: %w", err)
 	}
@@ -251,13 +252,3 @@ func (r *NetworkReconciler) SetupWithManager(mgr ctrl.Manager, metalnetCache cac
 		).
 		Complete(r)
 }
-
-// func (r *NetworkReconciler) networkStatusChangedPredicate() predicate.Predicate {
-// 	return predicate.Funcs{
-// 		UpdateFunc: func(evt event.UpdateEvent) bool {
-// 			oldNetwork := evt.ObjectOld.(*apinetv1alpha1.Network)
-// 			newNetwork := evt.ObjectNew.(*apinetv1alpha1.Network)
-// 			return !slices.Equal(oldNetwork.Status.Peerings, newNetwork.Status.Peerings)
-// 		},
-// 	}
-// }
diff --git a/metalnetlet/controllers/network_controller_test.go b/metalnetlet/controllers/network_controller_test.go
@@ -114,17 +114,17 @@ var _ = Describe("NetworkController", func() {
 
 		By("ensuring apinet network status peerings are also updated")
 		Eventually(Object(network1)).Should(SatisfyAll(
-			HaveField("Status.Peerings", []apinetv1alpha1.NetworkPeeringStatus{{
+			HaveField("Status.Peerings", HaveKeyWithValue(partitionName, []apinetv1alpha1.NetworkPeeringStatus{{
 				ID:    network2Vni,
 				State: apinetv1alpha1.NetworkPeeringStateReady,
-			}}),
+			}})),
 		))
 
 		Eventually(Object(network2)).Should(SatisfyAll(
-			HaveField("Status.Peerings", []apinetv1alpha1.NetworkPeeringStatus{{
+			HaveField("Status.Peerings", HaveKeyWithValue(partitionName, []apinetv1alpha1.NetworkPeeringStatus{{
 				ID:    network1Vni,
 				State: apinetv1alpha1.NetworkPeeringStateReady,
-			}}),
+			}})),
 		))
 
 		By("deleting the networks")