initial work to reconcile devices from launcher pods

harvester · Sep 13, 2024 · 45f4685 · 45f4685
1 parent b6ed907
commit 45f4685
Show file tree

Hide file tree

Showing 10 changed files with 1,131 additions and 8 deletions.
diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go
@@ -37,6 +37,8 @@ func main() {
 				kubevirtv1.SchemeGroupVersion.Group: {
 					Types: []interface{}{
 						kubevirtv1.KubeVirt{},
+						kubevirtv1.VirtualMachineInstance{},
+						kubevirtv1.VirtualMachine{},
 					},
 					GenerateTypes:   false,
 					GenerateClients: true,

diff --git a/pkg/config/factory_magement.go b/pkg/config/factory_magement.go
@@ -1,11 +1,12 @@
 package config
 
 import (
-	ctlnetwork "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io"
 	ctlcore "github.com/rancher/wrangler/pkg/generated/controllers/core"
 	"k8s.io/client-go/rest"
 	"kubevirt.io/client-go/kubecli"
 
+	ctlnetwork "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io"
+
 	ctldevices "github.com/harvester/pcidevices/pkg/generated/controllers/devices.harvesterhci.io"
 	ctlkubevirt "github.com/harvester/pcidevices/pkg/generated/controllers/kubevirt.io"
 )

diff --git a/pkg/controller/setup.go b/pkg/controller/setup.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	ctlnetwork "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io"
 	"github.com/rancher/lasso/pkg/cache"
 	"github.com/rancher/lasso/pkg/client"
 	"github.com/rancher/lasso/pkg/controller"
@@ -18,13 +17,16 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"kubevirt.io/client-go/kubecli"
 
+	ctlnetwork "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io"
+
 	"github.com/harvester/pcidevices/pkg/config"
 	"github.com/harvester/pcidevices/pkg/controller/gpudevice"
 	"github.com/harvester/pcidevices/pkg/controller/nodecleanup"
 	"github.com/harvester/pcidevices/pkg/controller/nodes"
 	"github.com/harvester/pcidevices/pkg/controller/pcideviceclaim"
 	"github.com/harvester/pcidevices/pkg/controller/sriovdevice"
 	"github.com/harvester/pcidevices/pkg/controller/usbdevice"
+	"github.com/harvester/pcidevices/pkg/controller/virtualmachineinstance"
 	"github.com/harvester/pcidevices/pkg/crd"
 	ctldevices "github.com/harvester/pcidevices/pkg/generated/controllers/devices.harvesterhci.io"
 	ctlkubevirt "github.com/harvester/pcidevices/pkg/generated/controllers/kubevirt.io"
@@ -103,6 +105,7 @@ func Setup(ctx context.Context, cfg *rest.Config, _ *runtime.Scheme) error {
 		sriovdevice.Register,
 		nodecleanup.Register,
 		gpudevice.Register,
+		virtualmachineinstance.Register,
 	}
 
 	for _, register := range registers {
@@ -111,7 +114,7 @@ func Setup(ctx context.Context, cfg *rest.Config, _ *runtime.Scheme) error {
 		}
 	}
 
-	if err := start.All(ctx, 2, coreFactory, networkFactory, deviceFactory); err != nil {
+	if err := start.All(ctx, 2, coreFactory, networkFactory, deviceFactory, kubevirtFactory); err != nil {
 		return fmt.Errorf("error starting controllers :%v", err)
 	}