feat: remove orphaned USB device automatically and add reconcile afte…

…r deleting claim Signed-off-by: Jack Yu <[email protected]>
harvester · Oct 8, 2024 · c63833e · c63833e
1 parent b84ac9a
commit c63833e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/controller/usbdevice/usbdevice_claim_controller.go b/pkg/controller/usbdevice/usbdevice_claim_controller.go
@@ -23,15 +23,15 @@ type DevClaimHandler struct {
 	lock                 *sync.Mutex
 	usbDeviceCache       ctldevicerv1beta1.USBDeviceCache
 	managedDevicePlugins map[string]*deviceplugins.USBDevicePlugin
-	reconcileUSBDevice   chan struct{}
+	reconcileUSBDevice   chan<- struct{}
 }
 
 func NewClaimHandler(
 	usbDeviceCache ctldevicerv1beta1.USBDeviceCache,
 	usbClaimClient ctldevicerv1beta1.USBDeviceClaimClient,
 	usbClient ctldevicerv1beta1.USBDeviceClient,
 	virtClient ctlkubevirtv1.KubeVirtClient,
-	reconcileUSBDevice chan struct{},
+	reconcileUSBDevice chan<- struct{},
 ) *DevClaimHandler {
 	return &DevClaimHandler{
 		usbDeviceCache:       usbDeviceCache,

diff --git a/pkg/webhook/indexer.go b/pkg/webhook/indexer.go
@@ -23,6 +23,8 @@ func RegisterIndexers(clients *Clients) {
 	vmCache := clients.KubevirtFactory.Kubevirt().V1().VirtualMachine().Cache()
 	vmCache.AddIndexer(VMByName, vmByName)
 	vmCache.AddIndexer(VMByPCIDeviceClaim, common.VMByHostDeviceName)
+	// Because USB device don't have same problem which vGPU and PCI device have,
+	// so we just need to use a simple way to collect the host device names.
 	vmCache.AddIndexer(VMByUSBDeviceClaim, common.VMBySpecHostDeviceName)
 	vmCache.AddIndexer(VMByVGPU, common.VMByVGPUDevice)
 	deviceCache := clients.DeviceFactory.Devices().V1beta1().PCIDevice().Cache()