fix: remove useless spec in usb device claim

Signed-off-by: Jack Yu <jack.yu@suse.com>
harvester · Jul 2, 2024 · 2418b04 · 2418b04
1 parent e85661d
commit 2418b04
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 29 deletions.
diff --git a/charts/templates/crds.yaml b/charts/templates/crds.yaml
@@ -464,8 +464,6 @@ spec:
     schema:
       openAPIV3Schema:
         properties:
-          spec:
-            type: object
           status:
             properties:
               nodeName:
@@ -957,8 +955,6 @@ spec:
   validation:
     openAPIV3Schema:
       properties:
-        spec:
-          type: object
         status:
           properties:
             nodeName:

diff --git a/pkg/apis/devices.harvesterhci.io/v1beta1/usb_device_claim.go b/pkg/apis/devices.harvesterhci.io/v1beta1/usb_device_claim.go
@@ -11,13 +11,9 @@ type USBDeviceClaim struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   USBDeviceClaimSpec   `json:"spec,omitempty"`
 	Status USBDeviceClaimStatus `json:"status,omitempty"`
 }
 
-type USBDeviceClaimSpec struct {
-}
-
 type USBDeviceClaimStatus struct {
 	NodeName   string `json:"nodeName"`
 	PCIAddress string `json:"pciAddress"`

diff --git a/pkg/apis/devices.harvesterhci.io/v1beta1/zz_generated_deepcopy.go b/pkg/apis/devices.harvesterhci.io/v1beta1/zz_generated_deepcopy.go
diff --git a/pkg/util/gousb/usbid/load_data.go b/pkg/util/gousb/usbid/load_data.go
@@ -27,8 +27,8 @@ import "time"
 //
 // The baked-in data was last generated:
 //
-// 2024-06-03 16:38:13.268049 +0800 CST m=+1.575758543
-var LastUpdate = time.Unix(0, 1717403893268049000)
+// 2024-07-02 11:16:54.773304 +0800 CST m=+3.301417917
+var LastUpdate = time.Unix(0, 1719890214773304000)
 
 const usbIDListData = `#
 #	List of USB ID's

diff --git a/pkg/webhook/pcideviceclaim_test.go b/pkg/webhook/pcideviceclaim_test.go
@@ -46,7 +46,6 @@ var (
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "usbdeviceclaim1",
 		},
-		Spec: devicesv1beta1.USBDeviceClaimSpec{},
 		Status: devicesv1beta1.USBDeviceClaimStatus{
 			NodeName:   "node1",
 			PCIAddress: "0000:04:10.0",

diff --git a/pkg/webhook/usbdeviceclaim_test.go b/pkg/webhook/usbdeviceclaim_test.go
@@ -30,7 +30,6 @@ var (
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "usbdevice1",
 		},
-		Spec: devicesv1beta1.USBDeviceClaimSpec{},
 	}
 
 	vmWithValidUSBDeviceName = &kubevirtv1.VirtualMachine{