Support bond configuration in NicMappings

This patch introduces the possibility of defining a new OVNController
API parameter called BondConfiguration which is used together with
NicMappings to allow the existence bond type interfaces.

The configuration would be structured as follows:

spec:
...
  bondConfiguration:
    bond0:
      links:
      - eth10.10
      - eth10.20
      mtu: 1500
      mode: active-backup
  nicMappings:
    datacentre: bond0
...

In this case, the datacentre nic would be the primary bond interface and
links eth10.10 and eth10.20 the members of such configuration. Mode and
MTU can be optionally changed too, with defaults set as the one seen in
the example above.

Kuttl test are also added for this case.

Jira: OSPRH-18846
Assisted-by: Claude
Signed-off-by: Elvira Garcia <[email protected]>

Author: elvgarrui

api/bases/ovn.openstack.org_ovncontrollers.yaml

@@ -52,6 +52,27 @@ spec:
           spec:
             description: OVNControllerSpec defines the desired state of OVNController
             properties:
+              bondConfiguration:
+                additionalProperties:
+                  description: Bond defines the configuration of each bond interface
+                    in the deployment
+                  properties:
+                    links:
+                      default: []
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: set
+                    mode:
+                      default: active-backup
+                      type: string
+                    mtu:
+                      default: 1500
+                      format: int32
+                      type: integer
+                  type: object
+                description: Map of bond names to their configuration
+                type: object
               exporterImage:
                 description: ExporterImage - Container Image URL for the openstack-network-exporter
                   metrics daemonset (will be set to environmental default if empty)

api/v1beta1/ovncontroller_types.go

@@ -75,6 +75,11 @@ type OVNControllerSpecCore struct {
 	// +optional
 	NicMappings map[string]string `json:"nicMappings,omitempty"`
 
+	// +kubebuilder:validation:Optional
+	// +optional
+	// Map of bond names to their configuration
+	BondConfiguration map[string]Bond `json:"bondConfiguration,omitempty"`
+
 	// +kubebuilder:validation:Optional
 	// Resources - Compute Resources required by this service (Limits/Requests).
 	// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
@@ -196,6 +201,22 @@ type OVSExternalIDs struct {
 	EnableChassisAsGateway *bool `json:"enable-chassis-as-gateway"`
 }
 
+// Bond defines the configuration of each bond interface in the deployment
+type Bond struct {
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default="active-backup"
+	Mode string `json:"mode,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=1500
+	Mtu int32 `json:"mtu,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +listType=set
+	// +kubebuilder:default={}
+	Links []string `json:"links"`
+}
+
 // RbacConditionsSet - set the conditions for the rbac object
 func (instance OVNController) RbacConditionsSet(c *condition.Condition) {
 	instance.Status.Conditions.Set(c)

api/v1beta1/zz_generated.deepcopy.go

@@ -52,6 +52,27 @@ spec:
           spec:
             description: OVNControllerSpec defines the desired state of OVNController
             properties:
+              bondConfiguration:
+                additionalProperties:
+                  description: Bond defines the configuration of each bond interface
+                    in the deployment
+                  properties:
+                    links:
+                      default: []
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: set
+                    mode:
+                      default: active-backup
+                      type: string
+                    mtu:
+                      default: 1500
+                      format: int32
+                      type: integer
+                  type: object
+                description: Map of bond names to their configuration
+                type: object
               exporterImage:
                 description: ExporterImage - Container Image URL for the openstack-network-exporter
                   metrics daemonset (will be set to environmental default if empty)

config/crd/bases/ovn.openstack.org_ovncontrollers.yaml

@@ -19,7 +19,6 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"sort"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -495,7 +494,16 @@ func (r *OVNControllerReconciler) reconcileNormal(ctx context.Context, instance
 	}
 
 	// Create or Update additional Physical Network Attachments
-	networkAttachments, err := ovncontroller.CreateOrUpdateAdditionalNetworks(ctx, helper, instance, ovsServiceLabels)
+	// network to attach to
+	networkAttachments := []string{}
+	networkAttachmentsNoPhysNet := []string{}
+	if instance.Spec.NetworkAttachment != "" {
+		networkAttachments = append(networkAttachments, instance.Spec.NetworkAttachment)
+		networkAttachmentsNoPhysNet = append(networkAttachmentsNoPhysNet, instance.Spec.NetworkAttachment)
+	}
+
+	networkAttachments, err = ovncontroller.CreateOrUpdateAdditionalNetworks(ctx, helper, instance, ovsServiceLabels, networkAttachments)
+
 	if err != nil {
 		Log.Info(fmt.Sprintf("Failed to create additional networks: %s", err))
 		instance.Status.Conditions.Set(condition.FalseCondition(
@@ -507,14 +515,6 @@ func (r *OVNControllerReconciler) reconcileNormal(ctx context.Context, instance
 		return ctrl.Result{}, err
 	}
 
-	// network to attach to
-	networkAttachmentsNoPhysNet := []string{}
-	if instance.Spec.NetworkAttachment != "" {
-		networkAttachments = append(networkAttachments, instance.Spec.NetworkAttachment)
-		networkAttachmentsNoPhysNet = append(networkAttachmentsNoPhysNet, instance.Spec.NetworkAttachment)
-	}
-	sort.Strings(networkAttachments)
-
 	nadList := []netattdefv1.NetworkAttachmentDefinition{}
 	for _, netAtt := range networkAttachments {
 		nad, err := nad.GetNADWithName(ctx, helper, netAtt, instance.Namespace)

controllers/ovncontroller_controller.go

@@ -28,5 +28,6 @@ for crd in config/crd/bases/*.yaml; do
     $CHECKER check-manifests \
         $CHECKER_ARGS \
         --existing-crd-filename="$TMP_DIR/$crd" \
-        --new-crd-filename="$crd"
+        --new-crd-filename="$crd" \
+        --disabled-validators NoMaps
 done