feat: gpu traits filtering

Signed-off-by: Dario Tranchitella <[email protected]>

Author: prometherion

apis/nodecore/v1alpha1/k8slice_selector.go

@@ -14,7 +14,9 @@
 
 package v1alpha1
 
-import "k8s.io/klog/v2"
+import (
+	"k8s.io/klog/v2"
+)
 
 // K8SliceSelector is the selector for a K8Slice.
 type K8SliceSelector struct {
@@ -32,6 +34,9 @@ type K8SliceSelector struct {
 
 	// StorageFilter is the Storage filter of the K8SliceSelector.
 	StorageFilter *ResourceQuantityFilter `json:"storageFilter,omitempty"`
+
+	//GPUFilters is the advanced GPU filter of the K8SliceSelector
+	GPUFilters []GPUFieldSelector `json:"gpuFilters,omitempty"`
 }
 
 // GetFlavorTypeSelector returns the type of the Flavor.

apis/nodecore/v1alpha1/selector.go

@@ -34,6 +34,30 @@ const (
 // FilterType is the type of filter that can be applied to a resource quantity.
 type FilterType string
 
+// BooleanFilter is a filter that can be applied to a boolean value.
+type BooleanFilter struct {
+	Data runtime.RawExtension `json:"data"`
+}
+
+type NumberFilter struct {
+	// Name indicates the type of the filter
+	Name FilterType `json:"name"`
+	// Filter data
+	Data runtime.RawExtension `json:"data"`
+}
+
+type NumberMatchSelector struct {
+	// Value is the value to match
+	Value float64 `json:"value"`
+}
+
+type NumberRangeSelector struct {
+	// Min is the minimum value of the range
+	Min *float64 `json:"min,omitempty"`
+	// Max is the maximum value of the range
+	Max *float64 `json:"max,omitempty"`
+}
+
 // StringFilter is a filter that can be applied to a string.
 type StringFilter struct {
 	// Name indicates the type of the filter
@@ -76,6 +100,28 @@ type ResourceRangeSelector struct {
 	Max *resource.Quantity `json:"max,omitempty"`
 }
 
+type SelectorName string
+
+var (
+	ResourceRangeSelectorName = SelectorName("ResourceRangeSelector")
+	ResourceMatchSelectorName = SelectorName("ResourceMatchSelector")
+	StringRangeSelectorName   = SelectorName("StringRangeSelector")
+	StringFilterSelectorName  = SelectorName("StringFilter")
+	BooleanFilterSelectorName = SelectorName("BooleanFilter")
+	NumberRangeSelectorName   = SelectorName("NumberRangeFilter")
+	NumberMatchSelectorName   = SelectorName("NumberMatchFilter")
+)
+
+type GPUFieldSelector struct {
+	// Field is the GPU field the filter should evaluate.
+	Field string `json:"field"`
+	// Selector is the name of the concrete Selector to enforce for the given data.
+	//+kubebuilder:validation:Enum=ResourceRangeSelector;ResourceMatchSelector;StringRangeSelector;StringFilter;BooleanFilter;NumberRangeFilter;NumberFilter
+	Selector SelectorName `json:"filter"`
+	// Data contains the raw data for the given filter.
+	Data runtime.RawExtension `json:"data"`
+}
+
 // ParseResourceQuantityFilter parses a ResourceQuantityFilter into a FilterType and the corresponding filter data.
 // It also provides a set of validation rules for the filter data.
 // Particularly for the ResourceRangeSelector, it checks that at least one of min or max is set and that min is less than max if both are set.

apis/nodecore/v1alpha1/zz_generated.deepcopy.go

@@ -6,6 +6,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/liqotech/liqo v1.0.0
 	github.com/rabbitmq/amqp091-go v1.10.0
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	k8s.io/api v0.32.1
 	k8s.io/apimachinery v0.32.1
 	k8s.io/client-go v0.32.1

go.mod

@@ -161,6 +161,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
 golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=

go.sum

@@ -1101,14 +1101,8 @@ func computeK8SliceCharacteristics(origin *nodecorev1alpha1.K8SliceCharacteristi
 			switch {
 			case part.Gpu != nil && origin != nil:
 				// Gpu is present in the origin and in the partition
-				newGpuCores := origin.Gpu.Cores.DeepCopy()
-				newGpuCores.Sub(part.Gpu.Cores)
-				newGpuMemory := origin.Gpu.Memory.DeepCopy()
-				newGpuMemory.Sub(part.Gpu.Memory)
-
 				newGpu := origin.DeepCopy()
-				newGpu.Gpu.Cores = newGpuCores
-				newGpu.Gpu.Memory = newGpuMemory
+				newGpu.Gpu.Count = 0
 
 				return newGpu.Gpu
 			case part.Gpu == nil && origin.Gpu != nil:
@@ -1207,7 +1201,6 @@ func reduceFlavorAvailability(ctx context.Context, flavor *nodecorev1alpha1.Flav
 			}
 
 			newFlavor := resourceforge.ForgeFlavorFromRef(flavor, newFlavorType)
-
 			// Create new Flavor
 			if err := r.Create(ctx, newFlavor); err != nil {
 				klog.Errorf("Error when creating Flavor %s: %v", newFlavor.Name, err)

pkg/rear-manager/allocation_controller.go

@@ -18,8 +18,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"regexp"
+	"slices"
 
+	"golang.org/x/exp/maps"
 	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 
 	advertisementv1alpha1 "github.com/fluidos-project/node/apis/advertisement/v1alpha1"
@@ -144,6 +148,56 @@ func filterResourceQuantityFilter(selectorValue resource.Quantity, filter models
 	return true
 }
 
+func filterNumberFilter(selectorValue float64, filter models.NumberFilter) bool {
+	switch filter.Name {
+	case models.MatchFilter:
+		// Parse the filter to a match filter
+		var matchFilter models.NumberMatchFilter
+		err := json.Unmarshal(filter.Data, &matchFilter)
+		if err != nil {
+			klog.Errorf("Error unmarshalling match filter: %v", err)
+			return false
+		}
+		// Check if the selector value matches the filter value
+		if selectorValue != matchFilter.Value {
+			klog.Infof("Match Filter: %f - Selector Value: %s", matchFilter.Value, selectorValue)
+			return false
+		}
+	case models.RangeFilter:
+		// Parse the filter to a range filter
+		var rangeFilter models.NumberRangeFilter
+		err := json.Unmarshal(filter.Data, &rangeFilter)
+		if err != nil {
+			klog.Errorf("Error unmarshalling range filter: %v", err)
+			return false
+		}
+		// Check if the selector value is within the range
+		// If the rangeFilter.Min exists check if the selector value is greater or equal to it
+		if rangeFilter.Min != nil {
+			if selectorValue < *rangeFilter.Min {
+				klog.Infof("Range Filter: %v-%v - Selector Value: %v", rangeFilter.Min, rangeFilter.Max, selectorValue)
+				return false
+			}
+		}
+		// If the rangeFilter.Max exists check if the selector value is less or equal to it
+		if rangeFilter.Max != nil {
+			if selectorValue > *rangeFilter.Max {
+				klog.Infof("Range Filter: %v-%v - Selector Value: %v", rangeFilter.Min, rangeFilter.Max, selectorValue)
+				return false
+			}
+		}
+	default:
+		klog.Errorf("Filter name %s not supported", filter.Name)
+		return false
+	}
+
+	return true
+}
+
+func filterBooleanFilter(selectorValue bool, filter models.BooleanFilter) bool {
+	return selectorValue != filter.Condition
+}
+
 func filterStringFilter(selectorValue string, filter models.StringFilter) bool {
 	switch filter.Name {
 	case models.MatchFilter:
@@ -230,6 +284,66 @@ func filterFlavorK8Slice(k8SliceSelector *models.K8SliceSelector, flavorTypeK8Sl
 		}
 	}
 
+	if gpuTraits := flavorTypeK8SliceCR.Characteristics.Gpu; gpuTraits != nil {
+		copied := gpuTraits.DeepCopy()
+		u, err := runtime.DefaultUnstructuredConverter.ToUnstructured(copied)
+		if err != nil {
+			klog.Errorf("Error converting gpu traits to unstructured: %v", err)
+			return false
+		}
+
+		keys := maps.Keys(k8SliceSelector.GPUFields)
+		slices.Sort(keys)
+
+		for _, key := range keys {
+			filter := k8SliceSelector.GPUFields[key]
+
+			switch f := filter.(type) {
+			case models.NumberFilter:
+				v, found, _ := unstructured.NestedNumberAsFloat64(u, key)
+				if !found {
+					return false
+				}
+
+				if !filterNumberFilter(v, f) {
+					return false
+				}
+			case models.BooleanFilter:
+				v, found, _ := unstructured.NestedBool(u, key)
+				if !found {
+					return false
+				}
+
+				if !filterBooleanFilter(v, f) {
+					return false
+				}
+			case models.StringFilter:
+				v, found, _ := unstructured.NestedString(u, key)
+				if !found {
+					return false
+				}
+
+				if !filterStringFilter(v, f) {
+					return false
+				}
+			case models.ResourceQuantityFilter:
+				v, found, _ := unstructured.NestedString(u, key)
+				if !found {
+					return false
+				}
+
+				qty, parseErr := resource.ParseQuantity(v)
+				if parseErr != nil {
+					return false
+				}
+
+				if !filterResourceQuantityFilter(qty, f) {
+					return false
+				}
+			}
+		}
+	}
+
 	return true
 }