generate: Add USB Host Devices

- make generate - make rpm-deps Signed-off-by: Victor Toso <[email protected]>
bnabholz · Sep 19, 2023 · ca09f95 · ca09f95
1 parent 94b757d
commit ca09f95
Show file tree

Hide file tree

Showing 9 changed files with 295 additions and 12 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -1783,20 +1783,18 @@ rpm(
 )
 
 rpm(
-    name = "kernel-headers-0__5.14.0-362.el9.aarch64",
-    sha256 = "a5b1e12e2518cb492357278fe9d560c4daa8a2feefe9a04a74745bee61da4049",
+    name = "kernel-headers-0__5.14.0-364.el9.aarch64",
+    sha256 = "80896565b489078aa16387cc15fc3e33124da317df32ca760a18246a73527bed",
     urls = [
-        "http://mirror.stream.centos.org/9-stream/AppStream/aarch64/os/Packages/kernel-headers-5.14.0-362.el9.aarch64.rpm",
-        "https://storage.googleapis.com/builddeps/a5b1e12e2518cb492357278fe9d560c4daa8a2feefe9a04a74745bee61da4049",
+        "http://mirror.stream.centos.org/9-stream/AppStream/aarch64/os/Packages/kernel-headers-5.14.0-364.el9.aarch64.rpm",
     ],
 )
 
 rpm(
-    name = "kernel-headers-0__5.14.0-362.el9.x86_64",
-    sha256 = "58d39770426f835b72ad12500be4ff71d270a5f44310cc547bc2f4115f64b443",
+    name = "kernel-headers-0__5.14.0-364.el9.x86_64",
+    sha256 = "30795c050f07f3d6168f90cccf32968cfdc20e008f299df3355b8619fbddc804",
     urls = [
-        "http://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/kernel-headers-5.14.0-362.el9.x86_64.rpm",
-        "https://storage.googleapis.com/builddeps/58d39770426f835b72ad12500be4ff71d270a5f44310cc547bc2f4115f64b443",
+        "http://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/kernel-headers-5.14.0-364.el9.x86_64.rpm",
     ],
 )
 
@@ -4410,6 +4408,22 @@ rpm(
     ],
 )
 
+rpm(
+    name = "qemu-kvm-device-usb-host-17__8.0.0-13.el9.aarch64",
+    sha256 = "6766a8164e99c82cd985bd96f2653381564dada2ecb373ff8fc462733ce75ee8",
+    urls = [
+        "http://mirror.stream.centos.org/9-stream/AppStream/aarch64/os/Packages/qemu-kvm-device-usb-host-8.0.0-13.el9.aarch64.rpm",
+    ],
+)
+
+rpm(
+    name = "qemu-kvm-device-usb-host-17__8.0.0-13.el9.x86_64",
+    sha256 = "b42fbf8706a056377b87bd82c298d81261a89200e2768e90be84b3773491e59e",
+    urls = [
+        "http://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/qemu-kvm-device-usb-host-8.0.0-13.el9.x86_64.rpm",
+    ],
+)
+
 rpm(
     name = "qemu-kvm-device-usb-redirect-17__8.0.0-13.el9.x86_64",
     sha256 = "6de8f93673068504e702035ea064070663a3c8e7e91366e9b39a4ca8c8829597",

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -18362,6 +18362,14 @@
        "$ref": "#/definitions/v1.PciHostDevice"
       },
       "x-kubernetes-list-type": "atomic"
+     },
+     "usb": {
+      "type": "array",
+      "items": {
+       "default": {},
+       "$ref": "#/definitions/v1.USBHostDevice"
+      },
+      "x-kubernetes-list-type": "atomic"
      }
     }
    },
@@ -19127,6 +19135,44 @@
      }
     }
    },
+   "v1.USBHostDevice": {
+    "type": "object",
+    "required": [
+     "resourceName"
+    ],
+    "properties": {
+     "resourceName": {
+      "description": "Identifies the list of USB host devices. e.g: kubevirt.io/storage, kubevirt.io/bootable-usb, etc",
+      "type": "string",
+      "default": ""
+     },
+     "selectors": {
+      "type": "array",
+      "items": {
+       "default": {},
+       "$ref": "#/definitions/v1.USBSelector"
+      },
+      "x-kubernetes-list-type": "atomic"
+     }
+    }
+   },
+   "v1.USBSelector": {
+    "type": "object",
+    "required": [
+     "vendor",
+     "product"
+    ],
+    "properties": {
+     "product": {
+      "type": "string",
+      "default": ""
+     },
+     "vendor": {
+      "type": "string",
+      "default": ""
+     }
+    }
+   },
    "v1.UnpauseOptions": {
     "description": "UnpauseOptions may be provided on unpause request.",
     "type": "object",

diff --git a/hack/bootstrap.sh b/hack/bootstrap.sh
@@ -26,7 +26,7 @@ KUBEVIRT_NO_BAZEL=${KUBEVIRT_NO_BAZEL:-false}
 HOST_ARCHITECTURE="$(uname -m)"
 
 sandbox_root=${SANDBOX_DIR}/default/root
-sandbox_hash="8befce554e9cbd5a873531d06fa7d9b3f39f1b45"
+sandbox_hash="efe043bfc797b7ddacf24a7d9b36faf971835212"
 
 function kubevirt::bootstrap::regenerate() {
     (

diff --git a/manifests/generated/kv-resource.yaml b/manifests/generated/kv-resource.yaml
@@ -673,6 +673,32 @@ spec:
                           type: object
                         type: array
                         x-kubernetes-list-type: atomic
+                      usb:
+                        items:
+                          properties:
+                            resourceName:
+                              description: 'Identifies the list of USB host devices.
+                                e.g: kubevirt.io/storage, kubevirt.io/bootable-usb,
+                                etc'
+                              type: string
+                            selectors:
+                              items:
+                                properties:
+                                  product:
+                                    type: string
+                                  vendor:
+                                    type: string
+                                required:
+                                - product
+                                - vendor
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          required:
+                          - resourceName
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
                     type: object
                   seccompConfiguration:
                     description: SeccompConfiguration holds Seccomp configuration
@@ -3680,6 +3706,32 @@ spec:
                           type: object
                         type: array
                         x-kubernetes-list-type: atomic
+                      usb:
+                        items:
+                          properties:
+                            resourceName:
+                              description: 'Identifies the list of USB host devices.
+                                e.g: kubevirt.io/storage, kubevirt.io/bootable-usb,
+                                etc'
+                              type: string
+                            selectors:
+                              items:
+                                properties:
+                                  product:
+                                    type: string
+                                  vendor:
+                                    type: string
+                                required:
+                                - product
+                                - vendor
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          required:
+                          - resourceName
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
                     type: object
                   seccompConfiguration:
                     description: SeccompConfiguration holds Seccomp configuration

diff --git a/pkg/virt-operator/resource/generate/components/validations_generated.go b/pkg/virt-operator/resource/generate/components/validations_generated.go
@@ -1271,6 +1271,31 @@ var CRDsValidation map[string]string = map[string]string{
                     type: object
                   type: array
                   x-kubernetes-list-type: atomic
+                usb:
+                  items:
+                    properties:
+                      resourceName:
+                        description: 'Identifies the list of USB host devices. e.g:
+                          kubevirt.io/storage, kubevirt.io/bootable-usb, etc'
+                        type: string
+                      selectors:
+                        items:
+                          properties:
+                            product:
+                              type: string
+                            vendor:
+                              type: string
+                          required:
+                          - product
+                          - vendor
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    required:
+                    - resourceName
+                    type: object
+                  type: array
+                  x-kubernetes-list-type: atomic
               type: object
             seccompConfiguration:
               description: SeccompConfiguration holds Seccomp configuration for Kubevirt

diff --git a/rpm/BUILD.bazel b/rpm/BUILD.bazel
@@ -580,6 +580,7 @@ rpmtree(
         "@qemu-kvm-core-17__8.0.0-13.el9.aarch64//rpm",
         "@qemu-kvm-device-display-virtio-gpu-17__8.0.0-13.el9.aarch64//rpm",
         "@qemu-kvm-device-display-virtio-gpu-pci-17__8.0.0-13.el9.aarch64//rpm",
+        "@qemu-kvm-device-usb-host-17__8.0.0-13.el9.aarch64//rpm",
         "@readline-0__8.1-4.el9.aarch64//rpm",
         "@rpm-0__4.16.1.3-25.el9.aarch64//rpm",
         "@rpm-libs-0__4.16.1.3-25.el9.aarch64//rpm",
@@ -785,6 +786,7 @@ rpmtree(
         "@qemu-img-17__8.0.0-13.el9.x86_64//rpm",
         "@qemu-kvm-common-17__8.0.0-13.el9.x86_64//rpm",
         "@qemu-kvm-core-17__8.0.0-13.el9.x86_64//rpm",
+        "@qemu-kvm-device-usb-host-17__8.0.0-13.el9.x86_64//rpm",
         "@qemu-kvm-device-usb-redirect-17__8.0.0-13.el9.x86_64//rpm",
         "@readline-0__8.1-4.el9.x86_64//rpm",
         "@rpm-0__4.16.1.3-25.el9.x86_64//rpm",
@@ -1542,7 +1544,7 @@ rpmtree(
         "@gmp-1__6.2.0-13.el9.aarch64//rpm",
         "@grep-0__3.6-5.el9.aarch64//rpm",
         "@gzip-0__1.12-1.el9.aarch64//rpm",
-        "@kernel-headers-0__5.14.0-362.el9.aarch64//rpm",
+        "@kernel-headers-0__5.14.0-364.el9.aarch64//rpm",
         "@keyutils-libs-0__1.6.3-1.el9.aarch64//rpm",
         "@krb5-libs-0__1.21.1-1.el9.aarch64//rpm",
         "@libacl-0__2.3.1-3.el9.aarch64//rpm",
@@ -1654,7 +1656,7 @@ rpmtree(
         "@gmp-1__6.2.0-13.el9.x86_64//rpm",
         "@grep-0__3.6-5.el9.x86_64//rpm",
         "@gzip-0__1.12-1.el9.x86_64//rpm",
-        "@kernel-headers-0__5.14.0-362.el9.x86_64//rpm",
+        "@kernel-headers-0__5.14.0-364.el9.x86_64//rpm",
         "@keyutils-libs-0__1.6.3-1.el9.x86_64//rpm",
         "@krb5-libs-0__1.21.1-1.el9.x86_64//rpm",
         "@libacl-0__2.3.1-3.el9.x86_64//rpm",

diff --git a/staging/src/kubevirt.io/api/core/v1/deepcopy_generated.go b/staging/src/kubevirt.io/api/core/v1/deepcopy_generated.go
diff --git a/staging/src/kubevirt.io/api/core/v1/types_swagger_generated.go b/staging/src/kubevirt.io/api/core/v1/types_swagger_generated.go