LocalDisk

Signed-off-by: Lukas Frank <[email protected]>

Author: lukasfrank

Makefile

@@ -1,5 +1,5 @@
 # Image URL to use all building/pushing image targets
-IMG ?= controller:latest
+IMG ?= libvirt-provider:latest
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28

api/machine.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	apiutils "github.com/ironcore-dev/provider-utils/apiutils/api"
+	"k8s.io/utils/ptr"
 )
 
 type Machine struct {
@@ -22,8 +23,7 @@ type MachineSpec struct {
 	Cpu         int64 `json:"cpu"`
 	MemoryBytes int64 `json:"memoryBytes"`
 
-	Image    *string `json:"image"`
-	Ignition []byte  `json:"ignition"`
+	Ignition []byte `json:"ignition"`
 
 	Volumes           []*VolumeSpec           `json:"volumes"`
 	NetworkInterfaces []*NetworkInterfaceSpec `json:"networkInterfaces"`
@@ -68,7 +68,7 @@ const (
 type VolumeSpec struct {
 	Name       string            `json:"name"`
 	Device     string            `json:"device"`
-	EmptyDisk  *EmptyDiskSpec    `json:"emptyDisk,omitempty"`
+	LocalDisk  *LocalDiskSpec    `json:"localDisk,omitempty"`
 	Connection *VolumeConnection `json:"cephDisk,omitempty"`
 }
 
@@ -79,8 +79,9 @@ type VolumeStatus struct {
 	Size   int64       `json:"size,omitempty"`
 }
 
-type EmptyDiskSpec struct {
-	Size int64 `json:"size"`
+type LocalDiskSpec struct {
+	Size  int64   `json:"size"`
+	Image *string `json:"image"`
 }
 
 type VolumeConnection struct {
@@ -122,3 +123,25 @@ const (
 type GuestAgentStatus struct {
 	Addr string `json:"addr,omitempty"`
 }
+
+func HasBootImage(machine *Machine) *string {
+	for _, volume := range machine.Spec.Volumes {
+		if volume.LocalDisk == nil {
+			continue
+		}
+
+		if volume.LocalDisk.Image != nil {
+			return volume.LocalDisk.Image
+		}
+	}
+	return nil
+}
+
+func IsImageReferenced(machine *Machine, image string) bool {
+	bootImage := HasBootImage(machine)
+	if bootImage == nil {
+		return false
+	}
+
+	return ptr.Deref(bootImage, "") == image
+}

cmd/libvirt-provider/app/app.go

@@ -33,7 +33,7 @@ import (
 	"github.com/ironcore-dev/libvirt-provider/internal/networkinterfaceplugin"
 	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/plugins/volume/localdisk"
 	"github.com/ironcore-dev/libvirt-provider/internal/raw"
 	"github.com/ironcore-dev/libvirt-provider/internal/server"
 	"github.com/ironcore-dev/libvirt-provider/internal/strategy"
@@ -265,7 +265,7 @@ func Run(ctx context.Context, opts Options) error {
 	volumePlugins := volumeplugin.NewPluginManager()
 	if err := volumePlugins.InitPlugins(providerHost, []volumeplugin.Plugin{
 		ceph.NewPlugin(),
-		emptydisk.NewPlugin(rawInst),
+		localdisk.NewPlugin(rawInst, imgCache),
 	}); err != nil {
 		setupLog.Error(err, "failed to initialize volume plugin manager")
 		return err

go.mod

@@ -1,8 +1,6 @@
 module github.com/ironcore-dev/libvirt-provider
 
-go 1.24.0
-
-toolchain go1.24.1
+go 1.24.1
 
 require (
 	github.com/blang/semver/v4 v4.0.0
@@ -11,7 +9,7 @@ require (
 	github.com/go-logr/logr v1.4.3
 	github.com/google/uuid v1.6.0
 	github.com/ironcore-dev/controller-utils v0.10.0
-	github.com/ironcore-dev/ironcore v0.2.4
+	github.com/ironcore-dev/ironcore v0.2.5-0.20251024123813-eecafba97af9
 	github.com/ironcore-dev/ironcore-image v0.2.5
 	github.com/ironcore-dev/ironcore-net v0.2.4
 	github.com/ironcore-dev/provider-utils v0.0.0-20251010114402-394db8015df4
@@ -24,13 +22,13 @@ require (
 	github.com/spf13/pflag v1.0.10
 	golang.org/x/sync v0.17.0
 	google.golang.org/grpc v1.76.0
-	k8s.io/api v0.33.4
-	k8s.io/apimachinery v0.33.4
-	k8s.io/client-go v0.33.4
-	k8s.io/kubectl v0.33.3
+	k8s.io/api v0.34.1
+	k8s.io/apimachinery v0.34.1
+	k8s.io/client-go v0.34.1
+	k8s.io/kubectl v0.34.1
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
 	libvirt.org/go/libvirtxml v1.11008.0
-	sigs.k8s.io/controller-runtime v0.21.0
+	sigs.k8s.io/controller-runtime v0.22.3
 )
 
 require (
@@ -57,7 +55,7 @@ require (
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
@@ -67,7 +65,7 @@ require (
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
@@ -83,12 +81,13 @@ require (
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/spdystream v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.66.1 // indirect
@@ -113,25 +112,25 @@ require (
 	golang.org/x/mod v0.27.0 // indirect
 	golang.org/x/net v0.43.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
 	golang.org/x/term v0.34.0 // indirect
 	golang.org/x/text v0.28.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.36.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
-	google.golang.org/protobuf v1.36.8 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.33.3 // indirect
-	k8s.io/apiserver v0.33.3 // indirect
-	k8s.io/cli-runtime v0.33.3 // indirect
+	k8s.io/apiextensions-apiserver v0.34.1 // indirect
+	k8s.io/apiserver v0.34.1 // indirect
+	k8s.io/cli-runtime v0.34.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
+	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
 	oras.land/oras-go v1.2.6 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )