Use provider-utils and removed unused functionality

Signed-off-by: Lukas Frank <lukas.frank@sap.com>

Author: lukasfrank

api/api.go

@@ -4,20 +4,18 @@
 package api
 
 import (
-	"encoding/json"
-	"fmt"
-
 	"github.com/ironcore-dev/controller-utils/metautils"
 	irimeta "github.com/ironcore-dev/ironcore/iri/apis/meta/v1alpha1"
+	apiutils "github.com/ironcore-dev/provider-utils/apiutils/api"
 )
 
-func GetObjectMetadata(o Metadata) (*irimeta.ObjectMetadata, error) {
-	annotations, err := GetAnnotationsAnnotation(o)
+func GetObjectMetadata(o apiutils.Metadata) (*irimeta.ObjectMetadata, error) {
+	annotations, err := apiutils.GetAnnotationsAnnotation(o, AnnotationsAnnotation)
 	if err != nil {
 		return nil, err
 	}
 
-	labels, err := GetLabelsAnnotation(o)
+	labels, err := apiutils.GetLabelsAnnotation(o, LabelsAnnotation)
 	if err != nil {
 		return nil, err
 	}
@@ -37,77 +35,30 @@ func GetObjectMetadata(o Metadata) (*irimeta.ObjectMetadata, error) {
 	}, nil
 }
 
-func SetObjectMetadata(o Object, metadata *irimeta.ObjectMetadata) error {
-	if err := SetAnnotationsAnnotation(o, metadata.Annotations); err != nil {
+func SetObjectMetadata(o apiutils.Object, metadata *irimeta.ObjectMetadata) error {
+	if err := apiutils.SetAnnotationsAnnotation(o, AnnotationsAnnotation, metadata.Annotations); err != nil {
 		return err
 	}
-	if err := SetLabelsAnnotation(o, metadata.Labels); err != nil {
+	if err := apiutils.SetLabelsAnnotation(o, LabelsAnnotation, metadata.Labels); err != nil {
 		return err
 	}
 	return nil
 }
 
-func SetLabelsAnnotation(o Object, labels map[string]string) error {
-	data, err := json.Marshal(labels)
-	if err != nil {
-		return fmt.Errorf("error marshalling labels: %w", err)
-	}
-	metautils.SetAnnotation(o, LabelsAnnotation, string(data))
-	return nil
-}
-
-func GetLabelsAnnotation(o Metadata) (map[string]string, error) {
-	data, ok := o.GetAnnotations()[LabelsAnnotation]
-	if !ok {
-		return nil, fmt.Errorf("object has no labels at %s", LabelsAnnotation)
-	}
-
-	var labels map[string]string
-	if err := json.Unmarshal([]byte(data), &labels); err != nil {
-		return nil, err
-	}
-
-	return labels, nil
-}
-
-func SetAnnotationsAnnotation(o Object, annotations map[string]string) error {
-	data, err := json.Marshal(annotations)
-	if err != nil {
-		return fmt.Errorf("error marshalling annotations: %w", err)
-	}
-	metautils.SetAnnotation(o, AnnotationsAnnotation, string(data))
-
-	return nil
-}
-
-func GetAnnotationsAnnotation(o Metadata) (map[string]string, error) {
-	data, ok := o.GetAnnotations()[AnnotationsAnnotation]
-	if !ok {
-		return nil, fmt.Errorf("object has no annotations at %s", AnnotationsAnnotation)
-	}
-
-	var annotations map[string]string
-	if err := json.Unmarshal([]byte(data), &annotations); err != nil {
-		return nil, err
-	}
-
-	return annotations, nil
-}
-
-func SetManagerLabel(o Object, manager string) {
+func SetManagerLabel(o apiutils.Object, manager string) {
 	metautils.SetLabel(o, ManagerLabel, manager)
 }
 
-func SetClassLabel(o Object, class string) {
+func SetClassLabel(o apiutils.Object, class string) {
 	metautils.SetLabel(o, ClassLabel, class)
 }
 
-func GetClassLabel(o Object) (string, bool) {
+func GetClassLabel(o apiutils.Object) (string, bool) {
 	class, found := o.GetLabels()[ClassLabel]
 	return class, found
 }
 
-func IsManagedBy(o Object, manager string) bool {
+func IsManagedBy(o apiutils.Object, manager string) bool {
 	actual, ok := o.GetLabels()[ManagerLabel]
 	return ok && actual == manager
 }

api/apiutils.go

@@ -5,10 +5,12 @@ package api
 
 import (
 	"time"
+
+	apiutils "github.com/ironcore-dev/provider-utils/apiutils/api"
 )
 
 type Machine struct {
-	Metadata `json:"metadata,omitempty"`
+	apiutils.Metadata `json:"metadata,omitempty"`
 
 	Spec   MachineSpec   `json:"spec"`
 	Status MachineStatus `json:"status"`

api/machine.go

@@ -18,14 +18,13 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/ironcore-dev/ironcore-image/oci/remote"
+	ocistore "github.com/ironcore-dev/ironcore-image/oci/store"
 	"github.com/ironcore-dev/ironcore/broker/common"
 	commongrpc "github.com/ironcore-dev/ironcore/broker/common/grpc"
 	iri "github.com/ironcore-dev/ironcore/iri/apis/machine/v1alpha1"
 	"github.com/ironcore-dev/libvirt-provider/api"
 	"github.com/ironcore-dev/libvirt-provider/internal/console"
 	"github.com/ironcore-dev/libvirt-provider/internal/controllers"
-	"github.com/ironcore-dev/libvirt-provider/internal/event"
-	"github.com/ironcore-dev/libvirt-provider/internal/event/machineevent"
 	"github.com/ironcore-dev/libvirt-provider/internal/healthcheck"
 	"github.com/ironcore-dev/libvirt-provider/internal/host"
 	"github.com/ironcore-dev/libvirt-provider/internal/libvirt/guest"
@@ -36,10 +35,12 @@ import (
 	volumeplugin "github.com/ironcore-dev/libvirt-provider/internal/plugins/volume"
 	"github.com/ironcore-dev/libvirt-provider/internal/plugins/volume/ceph"
 	"github.com/ironcore-dev/libvirt-provider/internal/plugins/volume/emptydisk"
-	"github.com/ironcore-dev/libvirt-provider/internal/qcow2"
 	"github.com/ironcore-dev/libvirt-provider/internal/raw"
 	"github.com/ironcore-dev/libvirt-provider/internal/server"
 	"github.com/ironcore-dev/libvirt-provider/internal/strategy"
+	"github.com/ironcore-dev/provider-utils/eventutils/event"
+	"github.com/ironcore-dev/provider-utils/eventutils/recorder"
+	hostutils "github.com/ironcore-dev/provider-utils/storeutils/host"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -79,7 +80,7 @@ type Options struct {
 	GCVMGracefulShutdownTimeout    time.Duration
 	ResyncIntervalGarbageCollector time.Duration
 
-	MachineEventStore machineevent.EventStoreOptions
+	MachineEventStore recorder.EventStoreOptions
 
 	VolumeCachePolicy string
 }
@@ -134,8 +135,6 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
 	fs.StringSliceVar(&o.Libvirt.PreferredDomainTypes, "preferred-domain-types", []string{"kvm", "qemu"}, "Ordered list of preferred domain types to use.")
 	fs.StringSliceVar(&o.Libvirt.PreferredMachineTypes, "preferred-machine-types", []string{"pc-q35"}, "Ordered list of preferred machine types to use.")
 
-	fs.StringVar(&o.Libvirt.Qcow2Type, "qcow2-type", qcow2.Default(), fmt.Sprintf("qcow2 implementation to use. Available: %v", qcow2.Available()))
-
 	fs.DurationVar(&o.GCVMGracefulShutdownTimeout, "gc-vm-graceful-shutdown-timeout", 5*time.Minute, "Duration to wait for the VM to gracefully shut down. If the VM does not shut down within this period, it will be forcibly destroyed by garbage collector.")
 	fs.DurationVar(&o.ResyncIntervalGarbageCollector, "gc-resync-interval", 1*time.Minute, "Interval for resynchronizing the garbage collector.")
 
@@ -227,15 +226,15 @@ func Run(ctx context.Context, opts Options) error {
 		return err
 	}
 
-	imgCache, err := oci.NewLocalCache(log, reg, providerHost.OCIStore())
+	ociStore, err := ocistore.New(providerHost.ImagesDir())
 	if err != nil {
-		setupLog.Error(err, "failed to initialize oci manager")
+		setupLog.Error(err, "error creating oci store")
 		return err
 	}
 
-	qcow2Inst, err := qcow2.Instance(opts.Libvirt.Qcow2Type)
+	imgCache, err := oci.NewLocalCache(log, reg, ociStore)
 	if err != nil {
-		setupLog.Error(err, "failed to initialize qcow2 instance")
+		setupLog.Error(err, "failed to initialize oci manager")
 		return err
 	}
 
@@ -258,7 +257,7 @@ func Run(ctx context.Context, opts Options) error {
 	volumePlugins := volumeplugin.NewPluginManager()
 	if err := volumePlugins.InitPlugins(providerHost, []volumeplugin.Plugin{
 		ceph.NewPlugin(),
-		emptydisk.NewPlugin(qcow2Inst, rawInst),
+		emptydisk.NewPlugin(rawInst),
 	}); err != nil {
 		setupLog.Error(err, "failed to initialize volume plugin manager")
 		return err
@@ -281,7 +280,7 @@ func Run(ctx context.Context, opts Options) error {
 	}
 
 	setupLog.Info("Configuring machine store", "Directory", providerHost.MachineStoreDir())
-	machineStore, err := host.NewStore(host.Options[*api.Machine]{
+	machineStore, err := hostutils.NewStore[*api.Machine](hostutils.Options[*api.Machine]{
 		NewFunc:        func() *api.Machine { return &api.Machine{} },
 		CreateStrategy: strategy.MachineStrategy,
 		Dir:            providerHost.MachineStoreDir(),
@@ -301,19 +300,18 @@ func Run(ctx context.Context, opts Options) error {
 		return err
 	}
 
-	eventStore := machineevent.NewEventStore(log, opts.MachineEventStore)
+	eventStore := recorder.NewEventStore(log, opts.MachineEventStore)
 
 	machineReconciler, err := controllers.NewMachineReconciler(
 		log.WithName("machine-reconciler"),
-		libvirt,
+		providerHost,
 		machineStore,
 		machineEvents,
 		eventStore,
 		controllers.MachineReconcilerOptions{
 			GuestCapabilities:              caps,
 			ImageCache:                     imgCache,
 			Raw:                            rawInst,
-			Host:                           providerHost,
 			VolumePluginManager:            volumePlugins,
 			NetworkInterfacePlugin:         nicPlugin,
 			ResyncIntervalVolumeSize:       opts.ResyncIntervalVolumeSize,

cmd/libvirt-provider/app/app.go

@@ -1,21 +1,22 @@
 module github.com/ironcore-dev/libvirt-provider
 
 go 1.24
+
 toolchain go1.24.1
 
 require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/ceph/go-ceph v0.32.0
 	github.com/containerd/containerd v1.7.26
-	github.com/digitalocean/go-libvirt v0.0.0-20250226181018-4d5f24afb7c2
+	github.com/digitalocean/go-libvirt v0.0.0-20250317183548-13bf9b43b50b
 	github.com/go-chi/chi/v5 v5.2.1
 	github.com/go-logr/logr v1.4.2
-	github.com/gogo/protobuf v1.3.2
 	github.com/google/uuid v1.6.0
 	github.com/ironcore-dev/controller-utils v0.9.8
 	github.com/ironcore-dev/ironcore v0.2.2
 	github.com/ironcore-dev/ironcore-image v0.2.4
 	github.com/ironcore-dev/ironcore-net v0.2.2
+	github.com/ironcore-dev/provider-utils v0.0.0-20250306151636-96670e489568
 	github.com/moby/term v0.5.2
 	github.com/onsi/ginkgo/v2 v2.23.0
 	github.com/onsi/gomega v1.36.2
@@ -26,10 +27,10 @@ require (
 	github.com/spf13/pflag v1.0.6
 	golang.org/x/sync v0.12.0
 	google.golang.org/grpc v1.71.0
-	k8s.io/api v0.32.2
-	k8s.io/apimachinery v0.32.2
-	k8s.io/client-go v0.32.2
-	k8s.io/kubectl v0.32.2
+	k8s.io/api v0.32.3
+	k8s.io/apimachinery v0.32.3
+	k8s.io/client-go v0.32.3
+	k8s.io/kubectl v0.32.3
 	k8s.io/utils v0.0.0-20241210054802-24370beab758
 	libvirt.org/go/libvirtxml v1.11000.1
 	sigs.k8s.io/controller-runtime v0.20.3
@@ -64,6 +65,7 @@ require (
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/gnostic-models v0.6.9 // indirect
@@ -122,7 +124,7 @@ require (
 	gotest.tools/v3 v3.5.1 // indirect
 	k8s.io/apiextensions-apiserver v0.32.2 // indirect
 	k8s.io/apiserver v0.32.2 // indirect
-	k8s.io/cli-runtime v0.32.2 // indirect
+	k8s.io/cli-runtime v0.32.3 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9 // indirect
 	oras.land/oras-go v1.2.6 // indirect