Auto-discover additional fields for cortex filtering

Author: PhilippMatthes

go.mod

@@ -7,7 +7,7 @@ go 1.25.0
 
 require (
 	github.com/cert-manager/cert-manager v1.19.2
-	github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251211190118-ddfb1ea3841c
+	github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229115749-52d9308090a6
 	github.com/coreos/go-systemd/v22 v22.6.0
 	github.com/digitalocean/go-libvirt v0.0.0-20251202224409-8b0babaf9393
 	github.com/godbus/dbus/v5 v5.2.0

go.sum

@@ -16,6 +16,14 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251211190118-ddfb1ea3841c h1:mIMnWtGSQKUWt0O2va45As+FWmqyud9GytZEgw/q51Y=
 github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251211190118-ddfb1ea3841c/go.mod h1:fBdTD4aqJ7o8QhxS9Hfu20mZYg4nu5RnrK8jestmL9c=
+github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229101148-5c49ce751841 h1:CQTvuKSm1YnALv5gJP2NkX5/3gz6qludor89PJ1eibw=
+github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229101148-5c49ce751841/go.mod h1:i/YQm59sAvilkgTFpKc+elMIf/KzkdimnXMd13P3V9s=
+github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229103057-906a154e6429 h1:1E4S42PyC1fsCJ2kjJ2qu+Ryk2vc7C0D1IInDaZWJGU=
+github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229103057-906a154e6429/go.mod h1:i/YQm59sAvilkgTFpKc+elMIf/KzkdimnXMd13P3V9s=
+github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229104931-d99e352a3886 h1:Tqvuis23JJnTJMhtL1zo5dqlV6THlNzsS+IfDzWTsRg=
+github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229104931-d99e352a3886/go.mod h1:i/YQm59sAvilkgTFpKc+elMIf/KzkdimnXMd13P3V9s=
+github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229115749-52d9308090a6 h1:yjxe8xMx3T2ZR8Vq9NqH332xoUXFAGhzZu/MLD34j0Q=
+github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251229115749-52d9308090a6/go.mod h1:i/YQm59sAvilkgTFpKc+elMIf/KzkdimnXMd13P3V9s=
 github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
 github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=

internal/controller/hypervisor_controller.go

@@ -26,6 +26,7 @@ import (
 
 	kvmv1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/api/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -51,9 +52,11 @@ type HypervisorReconciler struct {
 }
 
 const (
-	OSUpdateType           = "OperatingSystemUpdate"
-	LibVirtType            = "LibVirtConnection"
-	CapabilitiesClientType = "CapabilitiesClientConnection"
+	OSUpdateType                 = "OperatingSystemUpdate"
+	LibVirtType                  = "LibVirtConnection"
+	CapabilitiesClientType       = "CapabilitiesClientConnection"
+	DomainInfoClientType         = "DomainInfoClientConnection"
+	DomainCapabilitiesClientType = "DomainCapabilitiesClientConnection"
 )
 
 // +kubebuilder:rbac:groups=kvm.cloud.sap,resources=hypervisors,verbs=get;list;watch;update;patch;delete
@@ -190,20 +193,64 @@ func (r *HypervisorReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		// Update capabilities status.
 		if capabilities, err := r.Libvirt.GetCapabilities(); err == nil {
 			hypervisor.Status.Capabilities = capabilities
+			hypervisor.Status.Capacity = map[string]resource.Quantity{
+				"cpu":    capabilities.HostCpus,
+				"memory": capabilities.HostMemory,
+			}
 			meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
 				Type:   CapabilitiesClientType,
 				Status: metav1.ConditionTrue,
 				Reason: "CapabilitiesClientGetSucceeded",
 			})
 		} else {
 			log.Error(err, "failed to get capabilities")
+			hypervisor.Status.Capabilities = kvmv1.Capabilities{}
+			hypervisor.Status.Capacity = nil
 			meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
 				Type:    CapabilitiesClientType,
 				Status:  metav1.ConditionFalse,
 				Message: err.Error(),
 				Reason:  "CapabilitiesClientGetFailed",
 			})
 		}
+
+		// Update the hypervisor allocation.
+		if allocatedResources, err := r.Libvirt.GetAllocatedResources(); err == nil {
+			hypervisor.Status.Allocation = allocatedResources
+			meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
+				Type:   DomainInfoClientType,
+				Status: metav1.ConditionTrue,
+				Reason: "DomainInfoClientGetSucceeded",
+			})
+		} else {
+			log.Error(err, "failed to get allocated resources")
+			hypervisor.Status.Allocation = nil
+			meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
+				Type:    DomainInfoClientType,
+				Status:  metav1.ConditionFalse,
+				Message: err.Error(),
+				Reason:  "DomainInfoClientGetFailed",
+			})
+		}
+
+		// Update the domain capabilities status.
+		if domainCapabilities, err := r.Libvirt.GetDomainCapabilities(); err == nil {
+			hypervisor.Status.DomainCapabilities = domainCapabilities
+			meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
+				Type:   DomainCapabilitiesClientType,
+				Status: metav1.ConditionTrue,
+				Reason: "DomainCapabilitiesClientGetSucceeded",
+			})
+		} else {
+			log.Error(err, "failed to get domain capabilities")
+			hypervisor.Status.DomainCapabilities = kvmv1.DomainCapabilities{}
+			meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
+				Type:    DomainCapabilitiesClientType,
+				Status:  metav1.ConditionFalse,
+				Message: err.Error(),
+				Reason:  "DomainCapabilitiesClientGetFailed",
+			})
+		}
 	}
 
 	// Reconcile operating system update

internal/controller/hypervisor_controller_test.go

@@ -108,13 +108,26 @@ var _ = Describe("Hypervisor Controller", func() {
 					GetNumInstancesFunc: func() int {
 						return 1
 					},
-					GetCapabilitiesFunc: func() (kvmv1.CapabilitiesStatus, error) {
-						return kvmv1.CapabilitiesStatus{
+					GetCapabilitiesFunc: func() (kvmv1.Capabilities, error) {
+						return kvmv1.Capabilities{
 							HostCpuArch: "x86_64",
 							HostCpus:    *resource.NewQuantity(4, resource.DecimalSI),
 							HostMemory:  *resource.NewQuantity(8192, resource.DecimalSI),
 						}, nil
 					},
+					GetDomainCapabilitiesFunc: func() (kvmv1.DomainCapabilities, error) {
+						return kvmv1.DomainCapabilities{
+							Arch:              "x86_64",
+							HypervisorType:    "kvm",
+							SupportedCpuModes: []string{"mode/example", "mode/example/1"},
+						}, nil
+					},
+					GetAllocatedResourcesFunc: func() (map[string]resource.Quantity, error) {
+						return map[string]resource.Quantity{
+							"memory": *resource.NewQuantity(4096, resource.BinarySI),
+							"cpu":    *resource.NewQuantity(2, resource.DecimalSI),
+						}, nil
+					},
 				},
 				Systemd: &systemd.InterfaceMock{
 					CloseFunc: func() {},
@@ -146,7 +159,7 @@ var _ = Describe("Hypervisor Controller", func() {
 			Expect(hypervisor.Status.Instances).To(HaveLen(1))
 			Expect(hypervisor.Status.Instances[0].ID).To(Equal("25e2ea06-f6be-4bac-856d-8c2d0bdbcdee"))
 
-			Expect(hypervisor.Status.Conditions).To(HaveLen(3))
+			Expect(hypervisor.Status.Conditions).To(HaveLen(5))
 
 			Expect(hypervisor.Status.Conditions[0].Type).To(Equal("test-unit"))
 			Expect(hypervisor.Status.Conditions[0].Status).To(Equal(metav1.ConditionTrue))

internal/emulator/libvirt.go

@@ -22,10 +22,12 @@ import (
 
 	v1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/api/v1"
 	golibvirt "github.com/digitalocean/go-libvirt"
+	"k8s.io/apimachinery/pkg/api/resource"
 	logger "sigs.k8s.io/controller-runtime/pkg/log"
 
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt"
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt/capabilities"
+	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt/domcapabilities"
 )
 
 func NewLibVirtEmulator(ctx context.Context) *libvirt.InterfaceMock {
@@ -55,9 +57,19 @@ func NewLibVirtEmulator(ctx context.Context) *libvirt.InterfaceMock {
 			log.Info("IsConnectedFunc Func called")
 			return true
 		},
-		GetCapabilitiesFunc: func() (v1.CapabilitiesStatus, error) {
+		GetCapabilitiesFunc: func() (v1.Capabilities, error) {
 			return capabilities.NewClientEmulator().Get(nil)
 		},
+		GetDomainCapabilitiesFunc: func() (v1.DomainCapabilities, error) {
+			return domcapabilities.NewClientEmulator().Get(nil)
+		},
+		GetAllocatedResourcesFunc: func() (map[string]resource.Quantity, error) {
+			log.Info("GetAllocatedResourcesFunc Func called")
+			return map[string]resource.Quantity{
+				"cpu":    resource.MustParse("4"),
+				"memory": resource.MustParse("8192Mi"),
+			}, nil
+		},
 	}
 	return mockedInterface
 }

internal/libvirt/capabilities/client.go

@@ -25,12 +25,14 @@ import (
 	libvirt "github.com/digitalocean/go-libvirt"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt/util"
 )
 
 // Client that returns the capabilities of the host we are mounted on.
 type Client interface {
 	// Return the capabilities status of the host we are mounted on.
-	Get(virt *libvirt.Libvirt) (v1.CapabilitiesStatus, error)
+	Get(virt *libvirt.Libvirt) (v1.Capabilities, error)
 }
 
 // Implementation of the CapabilitiesClient interface.
@@ -42,16 +44,16 @@ func NewClient() Client {
 }
 
 // Return the capabilities of the host we are mounted on.
-func (m *client) Get(virt *libvirt.Libvirt) (v1.CapabilitiesStatus, error) {
+func (m *client) Get(virt *libvirt.Libvirt) (v1.Capabilities, error) {
 	capabilitiesXMLBytes, err := virt.Capabilities()
 	if err != nil {
 		log.Log.Error(err, "failed to get libvirt capabilities")
-		return v1.CapabilitiesStatus{}, err
+		return v1.Capabilities{}, err
 	}
 	var capabilities Capabilities
 	if err := xml.Unmarshal(capabilitiesXMLBytes, &capabilities); err != nil {
 		log.Log.Error(err, "failed to unmarshal libvirt capabilities")
-		return v1.CapabilitiesStatus{}, err
+		return v1.Capabilities{}, err
 	}
 	return convert(capabilities)
 }
@@ -65,30 +67,30 @@ func NewClientEmulator() Client {
 }
 
 // Get the capabilities of the host we are mounted on.
-func (c *clientEmulator) Get(virt *libvirt.Libvirt) (v1.CapabilitiesStatus, error) {
+func (c *clientEmulator) Get(virt *libvirt.Libvirt) (v1.Capabilities, error) {
 	var capabilities Capabilities
 	if err := xml.Unmarshal(exampleXML, &capabilities); err != nil {
 		log.Log.Error(err, "failed to unmarshal example capabilities")
-		return v1.CapabilitiesStatus{}, err
+		return v1.Capabilities{}, err
 	}
 	return convert(capabilities)
 }
 
 // Convert the libvirt capabilities to the API format.
-func convert(in Capabilities) (out v1.CapabilitiesStatus, err error) {
+func convert(in Capabilities) (out v1.Capabilities, err error) {
 	out.HostCpuArch = in.Host.CPU.Arch
 	// Loop over all numa cells to get the total memory + vcpus.
 	totalMemory := resource.NewQuantity(0, resource.BinarySI)
 	totalCpus := resource.NewQuantity(0, resource.DecimalSI)
 	for _, cell := range in.Host.Topology.CellSpec.Cells {
-		mem, err := cell.Memory.AsQuantity()
+		mem, err := util.MemoryToResource(cell.Memory.Value, cell.Memory.Unit)
 		if err != nil {
-			return v1.CapabilitiesStatus{}, err
+			return v1.Capabilities{}, err
 		}
 		totalMemory.Add(mem)
 		cpu := resource.NewQuantity(cell.CPUs.Num, resource.DecimalSI)
 		if cpu == nil {
-			return v1.CapabilitiesStatus{},
+			return v1.Capabilities{},
 				fmt.Errorf("invalid CPU count for cell %d", cell.ID)
 		}
 		totalCpus.Add(*cpu)

internal/libvirt/capabilities/schema.go

@@ -17,12 +17,6 @@ limitations under the License.
 
 package capabilities
 
-import (
-	"fmt"
-
-	"k8s.io/apimachinery/pkg/api/resource"
-)
-
 // Capabilities as returned from the libvirt driver capabilities api.
 //
 // The format is the same as returned when executing `virsh capabilities`. See:
@@ -71,27 +65,6 @@ type CapabilitiesHostTopologyCellMemory struct {
 	Value int64  `xml:",chardata"`
 }
 
-// Get the cell memory as resource.Quantity.
-func (c CapabilitiesHostTopologyCellMemory) AsQuantity() (resource.Quantity, error) {
-	var quantity *resource.Quantity
-	// Check the unit
-	switch c.Unit {
-	case "KiB":
-		quantity = resource.NewQuantity(c.Value*1024, resource.BinarySI)
-	case "MiB":
-		quantity = resource.NewQuantity(c.Value*1024*1024, resource.BinarySI)
-	case "GiB":
-		quantity = resource.NewQuantity(c.Value*1024*1024*1024, resource.BinarySI)
-	case "TiB":
-		quantity = resource.NewQuantity(c.Value*1024*1024*1024*1024, resource.BinarySI)
-	}
-	if quantity == nil {
-		return resource.Quantity{}, fmt.Errorf("unknown memory unit %s", c.Unit)
-	}
-	// Set the value
-	return *quantity, nil
-}
-
 type CapabilitiesHostTopologyCellPages struct {
 	Unit  string `xml:"unit,attr"`
 	Size  int    `xml:"size,attr"`