Feedback

Author: PhilippMatthes

cmd/main.go

@@ -29,7 +29,6 @@ import (
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/certificates"
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/emulator"
 	"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/sys"
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/systemd"
 
@@ -177,12 +176,10 @@ func main() {
 
 	var sysd systemd.Interface
 	var libv libvirt.Interface
-	var capabilitiesClient capabilities.Client
 	if os.Getenv("EMULATE") != "" {
 		ctx := logger.IntoContext(context.Background(), setupLog)
 		libv = emulator.NewLibVirtEmulator(ctx)
 		sysd = emulator.NewSystemdEmulator(ctx)
-		capabilitiesClient = capabilities.NewClientEmulator()
 	} else {
 		var err error
 		ctx := logger.IntoContext(context.Background(), setupLog)
@@ -192,15 +189,13 @@ func main() {
 			setupLog.Error(err, "unable to create systemd instance")
 			os.Exit(1)
 		}
-		capabilitiesClient = capabilities.NewClient()
 	}
 
 	if err = (&controller.HypervisorReconciler{
-		Client:             mgr.GetClient(),
-		Scheme:             mgr.GetScheme(),
-		Systemd:            sysd,
-		Libvirt:            libv,
-		CapabilitiesClient: capabilitiesClient,
+		Client:  mgr.GetClient(),
+		Scheme:  mgr.GetScheme(),
+		Systemd: sysd,
+		Libvirt: libv,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Hypervisor")
 		os.Exit(1)

internal/controller/hypervisor_controller.go

@@ -36,7 +36,6 @@ import (
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/certificates"
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/evacuation"
 	"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/sys"
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/systemd"
 )
@@ -48,9 +47,6 @@ type HypervisorReconciler struct {
 	Systemd systemd.Interface
 	Libvirt libvirt.Interface
 
-	// Client that connects to libvirt and fetches capabilities of the hypervisor.
-	CapabilitiesClient capabilities.Client
-
 	osDescriptor     *systemd.Descriptor
 	evacuateOnReboot bool
 }
@@ -140,7 +136,7 @@ func (r *HypervisorReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	// Update capabilities status.
 	var err error
-	hypervisor.Status.Capabilities, err = r.CapabilitiesClient.Get()
+	hypervisor.Status.Capabilities, err = r.Libvirt.GetCapabilities()
 	if err != nil {
 		log.Error(err, "failed to get capabilities")
 		meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{

internal/controller/hypervisor_controller_test.go

@@ -25,14 +25,14 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	kvmv1alpha1 "github.com/cobaltcore-dev/kvm-node-agent/api/v1alpha1"
 	"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/sys"
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/systemd"
 )
@@ -109,6 +109,13 @@ var _ = Describe("Hypervisor Controller", func() {
 					GetNumInstancesFunc: func() int {
 						return 1
 					},
+					GetCapabilitiesFunc: func() (kvmv1alpha1.CapabilitiesStatus, error) {
+						return kvmv1alpha1.CapabilitiesStatus{
+							HostCpuArch: "x86_64",
+							HostCpus:    *resource.NewQuantity(4, resource.DecimalSI),
+							HostMemory:  *resource.NewQuantity(8192, resource.DecimalSI),
+						}, nil
+					},
 				},
 				Systemd: &systemd.InterfaceMock{
 					CloseFunc: func() {},
@@ -128,7 +135,6 @@ var _ = Describe("Hypervisor Controller", func() {
 						return nil, nil
 					},
 				},
-				CapabilitiesClient: capabilities.NewClientEmulator(),
 			}
 
 			_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
@@ -153,6 +159,12 @@ var _ = Describe("Hypervisor Controller", func() {
 			Expect(hypervisor.Status.Conditions[2].Type).To(Equal("test-unit"))
 			Expect(hypervisor.Status.Conditions[2].Status).To(Equal(metav1.ConditionTrue))
 			Expect(hypervisor.Status.Conditions[2].Reason).To(Equal("Running"))
+
+			Expect(hypervisor.Status.Capabilities.HostCpuArch).To(Equal("x86_64"))
+			Expect(hypervisor.Status.Capabilities.HostCpus.AsDec().UnscaledBig()).
+				To(Equal(resource.NewQuantity(4, resource.DecimalSI).AsDec().UnscaledBig()))
+			Expect(hypervisor.Status.Capabilities.HostMemory.AsDec().UnscaledBig()).
+				To(Equal(resource.NewQuantity(8192, resource.DecimalSI).AsDec().UnscaledBig()))
 		})
 	})
 })

internal/emulator/libvirt.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/cobaltcore-dev/kvm-node-agent/api/v1alpha1"
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt"
+	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt/capabilities"
 )
 
 func NewLibVirtEmulator(ctx context.Context) *libvirt.InterfaceMock {
@@ -55,6 +56,9 @@ func NewLibVirtEmulator(ctx context.Context) *libvirt.InterfaceMock {
 			log.Info("IsConnectedFunc Func called")
 			return true
 		},
+		GetCapabilitiesFunc: func() (v1alpha1.CapabilitiesStatus, error) {
+			return capabilities.NewClientEmulator().Get(nil)
+		},
 	}
 	return mockedInterface
 }

internal/libvirt/capabilities/client.go

@@ -20,48 +20,30 @@ package capabilities
 import (
 	"encoding/xml"
 	"fmt"
-	"os"
 
 	"github.com/cobaltcore-dev/kvm-node-agent/api/v1alpha1"
 	libvirt "github.com/digitalocean/go-libvirt"
-	"github.com/digitalocean/go-libvirt/socket/dialers"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // 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() (v1alpha1.CapabilitiesStatus, error)
+	Get(virt *libvirt.Libvirt) (v1alpha1.CapabilitiesStatus, error)
 }
 
 // Implementation of the CapabilitiesClient interface.
-type client struct {
-	// Libvirt instance to connect to.
-	virt *libvirt.Libvirt
-}
+type client struct{}
 
-// Create a new capabilities client using the provided LIBVIRT_SOCKET env variable.
+// Create a new capabilities client.
 func NewClient() Client {
-	socketPath := os.Getenv("LIBVIRT_SOCKET")
-	if socketPath == "" {
-		socketPath = "/run/libvirt/libvirt-sock"
-	}
-	log.Log.Info("capabilities client uses libvirt socket", "socket", socketPath)
-	dialer := dialers.NewLocal(dialers.WithSocket(socketPath))
-	virt := libvirt.NewWithDialer(dialer)
-	return &client{virt: virt}
+	return &client{}
 }
 
 // Return the capabilities of the host we are mounted on.
-func (m *client) Get() (v1alpha1.CapabilitiesStatus, error) {
-	if !m.virt.IsConnected() {
-		if err := m.virt.Connect(); err != nil {
-			log.Log.Error(err, "failed to connect to libvirt")
-			return v1alpha1.CapabilitiesStatus{}, err
-		}
-	}
-	capabilitiesXMLBytes, err := m.virt.Capabilities()
+func (m *client) Get(virt *libvirt.Libvirt) (v1alpha1.CapabilitiesStatus, error) {
+	capabilitiesXMLBytes, err := virt.Capabilities()
 	if err != nil {
 		log.Log.Error(err, "failed to get libvirt capabilities")
 		return v1alpha1.CapabilitiesStatus{}, err
@@ -83,7 +65,7 @@ func NewClientEmulator() Client {
 }
 
 // Get the capabilities of the host we are mounted on.
-func (c *clientEmulator) Get() (v1alpha1.CapabilitiesStatus, error) {
+func (c *clientEmulator) Get(virt *libvirt.Libvirt) (v1alpha1.CapabilitiesStatus, error) {
 	var capabilities Capabilities
 	if err := xml.Unmarshal(exampleXML, &capabilities); err != nil {
 		log.Log.Error(err, "failed to unmarshal example capabilities")

internal/libvirt/capabilities/client_test.go

@@ -69,7 +69,7 @@ func TestNewClientEmulator(t *testing.T) {
 func TestClientEmulatorGet(t *testing.T) {
 	client := NewClientEmulator()
 
-	status, err := client.Get()
+	status, err := client.Get(nil)
 	if err != nil {
 		t.Fatalf("clientEmulator.Get() returned error: %v", err)
 	}

internal/libvirt/interface.go

@@ -46,4 +46,7 @@ type Interface interface {
 
 	// GetNumInstances returns the number of instances.
 	GetNumInstances() int
+
+	// Get the capabilities of the libvirt daemon.
+	GetCapabilities() (v1alpha1.CapabilitiesStatus, error)
 }

internal/libvirt/interface_mock.go

@@ -29,6 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	"github.com/cobaltcore-dev/kvm-node-agent/api/v1alpha1"
+	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt/capabilities"
 )
 
 type LibVirt struct {
@@ -38,6 +39,9 @@ type LibVirt struct {
 	migrationLock sync.Mutex
 	version       string
 	domains       map[libvirt.ConnectListAllDomainsFlags][]libvirt.Domain
+
+	// Client that connects to libvirt and fetches capabilities of the hypervisor.
+	capabilitiesClient capabilities.Client
 }
 
 func NewLibVirt(k client.Client) *LibVirt {
@@ -53,6 +57,7 @@ func NewLibVirt(k client.Client) *LibVirt {
 		sync.Mutex{},
 		"N/A",
 		make(map[libvirt.ConnectListAllDomainsFlags][]libvirt.Domain, 2),
+		capabilities.NewClient(),
 	}
 }
 
@@ -123,3 +128,8 @@ func (l *LibVirt) IsConnected() bool {
 func (l *LibVirt) GetNumInstances() int {
 	return len(l.domains[libvirt.ConnectListDomainsActive])
 }
+
+// Get the capabilities of the libvirt daemon.
+func (l *LibVirt) GetCapabilities() (v1alpha1.CapabilitiesStatus, error) {
+	return l.capabilitiesClient.Get(l.virt)
+}