diff --git a/.github/workflows/lib-publish.yaml b/.github/workflows/lib-publish.yaml index f9dd3b861..3357e76c7 100644 --- a/.github/workflows/lib-publish.yaml +++ b/.github/workflows/lib-publish.yaml @@ -11,7 +11,7 @@ on: required: false type: string env: - no_base_check: "['intel-qat-plugin-kerneldrv', 'intel-idxd-config-initcontainer', 'crypto-perf', 'opae-nlb-demo', 'intel-gpu-levelzero']" + no_base_check: "['intel-idxd-config-initcontainer', 'crypto-perf', 'opae-nlb-demo', 'intel-gpu-levelzero']" permissions: contents: read diff --git a/.github/workflows/lib-validate.yaml b/.github/workflows/lib-validate.yaml index 2de40e602..efb98f774 100644 --- a/.github/workflows/lib-validate.yaml +++ b/.github/workflows/lib-validate.yaml @@ -64,8 +64,8 @@ jobs: - name: Check Dockerfiles run: make check-dockerfiles - run: make go-mod-tidy - - run: make BUILDTAGS=kerneldrv - - run: make test BUILDTAGS=kerneldrv + - run: make + - run: make test env: UNITTEST: 1 - run: make check-github-actions @@ -77,9 +77,9 @@ jobs: strategy: matrix: version: - - 1.30.x - 1.31.x - 1.32.x + - 1.33.x steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5 diff --git a/.golangci.yml b/.golangci.yml index 7259906ab..c04d6d068 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,5 @@ version: "2" run: - build-tags: - - kerneldrv tests: true linters: default: none diff --git a/.trivyignore.yaml b/.trivyignore.yaml index 06c95300f..e086a8220 100644 --- a/.trivyignore.yaml +++ b/.trivyignore.yaml @@ -4,7 +4,6 @@ misconfigurations: paths: - dlb_plugin/base/intel-dlb-plugin.yaml - fpga_plugin/base/intel-fpga-plugin-daemonset.yaml - - qat_plugin/base/intel-qat-kernel-plugin.yaml - qat_plugin/overlays/qat_initcontainer/qat_initcontainer.yaml - id: AVD-KSV-0017 @@ -13,7 +12,6 @@ misconfigurations: - dlb_plugin/overlays/dlb_initcontainer/dlb_initcontainer.yaml - dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml - iaa_plugin/overlays/iaa_initcontainer/iaa_initcontainer.yaml - - qat_plugin/base/intel-qat-kernel-plugin.yaml - qat_plugin/overlays/qat_initcontainer/qat_initcontainer.yaml - id: AVD-KSV-0047 diff --git a/Makefile b/Makefile index 2978ea443..543cbb688 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ BUILDER ?= "docker" EXTRA_BUILD_ARGS ?= "" CERT_MANAGER_VERSION ?= v1.15.2 -CONTROLLER_GEN_VERSION ?= v0.17.0 +CONTROLLER_GEN_VERSION ?= v0.18.0 GOLANGCI_LINT_VERSION ?= v2.1.6 KIND_VERSION ?= v0.23.0 GOLICENSES_VERSION ?= v1.6.0 diff --git a/README.md b/README.md index d2fa60495..0aa68cb35 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,7 @@ The summary of resources available via plugins in this repository is given in th * [iaa-accel-config-demo-pod.yaml](demo/iaa-accel-config-demo-pod.yaml) * `npu.intel.com` : `accel` * [intel-npu-workload.yaml](demo/intel-npu-workload.yaml) - * `qat.intel.com` : `generic` or `cy`/`dc`/`asym-dc`/`sym-dc` + * `qat.intel.com` : `generic` or `cy`/`dc`/`asym-[dc|decomp]`/`sym-[dc|decomp]`/`asym-[dc|decomp]`/`asym-sym-[dc|decomp]`/`dcc`/`decomp` * [compress-perf-dpdk-pod-requesting-qat-dc.yaml](deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml) * [crypto-perf-dpdk-pod-requesting-qat-cy.yaml](deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml) * `sgx.intel.com` : `epc` diff --git a/cmd/qat_plugin/README.md b/cmd/qat_plugin/README.md index 611e9f39e..3067aebd0 100644 --- a/cmd/qat_plugin/README.md +++ b/cmd/qat_plugin/README.md @@ -32,7 +32,7 @@ Supported Devices include, but may not be limited to, the following: The QAT device plugin provides access to QAT hardware accelerated cryptographic and compression features through the SR-IOV virtual functions (VF). Demonstrations are provided utilising [DPDK](https://doc.dpdk.org/) and [OpenSSL](https://www.openssl.org/). -QAT Kubernetes resources show up as `qat.intel.com/generic` on systems _before_ QAT Gen4 (4th Gen Xeon®) and `qat.intel.com/[cy|dc]` on QAT Gen4. +QAT Kubernetes resources show up as `qat.intel.com/generic` on systems _before_ QAT Gen4 (4th Gen Xeon®) and `qat.intel.com/[]` on QAT Gen4+. ## Modes and Configuration Options @@ -120,8 +120,10 @@ In addition to the default configuration, you can add device-specific configurat | Device | Possible Configuration | How To Customize | Options | Notes | |:-------|:-----------------------|:-----------------|:--------|:------| -| 4xxx, 401xx, 402xx, 420xx | [cfg_services](https://github.com/torvalds/linux/blob/v6.6-rc5/Documentation/ABI/testing/sysfs-driver-qat) reports the configured services (crypto services or compression services) of the QAT device. | `ServicesEnabled=` | compress:`dc`, crypto:`sym;asym`,
crypto+compress:`asym;dc`,
crypto+compress:`sym;dc` | 4xxx/401xx/402xx: Linux 6.0+ kernel. 420xx: Linux 6.8+ kernel. | -| 4xxx, 401xx, 402xx, 420xx | [auto_reset](https://github.com/torvalds/linux/blob/a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6/Documentation/ABI/testing/sysfs-driver-qat#L145) reports the setting of the QAT device's automatic error recovery functionality. | `AutoresetEnabled=` | `on`, `off`, | Linux 6.8+ kernel. | +| 4xxx, 401xx, 402xx, 420xx, 6xxx | [cfg_services](https://github.com/torvalds/linux/blob/v6.16/Documentation/ABI/testing/sysfs-driver-qat) reports the configured services (crypto services or compression services) of the QAT device. | `ServicesEnabled=` | Available services: compress:`dc`, de-compress: `decomp`, (`6xxx` only), dc chaining feature: `dcc`, symmetric crypto: `sym`, asymmetric crypto: `asym`, | 4xxx/401xx/402xx: Linux 6.0+, 420xx: Linux 6.8+, 6xxx Linux 6.16. | +| 4xxx, 401xx, 402xx, 420xx, 6xxx | [auto_reset](https://github.com/torvalds/linux/blob/v6.16/Documentation/ABI/testing/sysfs-driver-qat#L145) reports the setting of the QAT device's automatic error recovery functionality. | `AutoresetEnabled=` | `on`, `off`, | 4xxx/401xx/402xx/420xx: Linux 6.8+, 6xxx: Linux 6.16+ | + +**Note:** Service combinations are permitted for all services except `dcc`. On QAT Gen4 devices (`qat_4xxx` driver) a maximum of two services can be combined and on QAT Gen6 devices (`qat_6xxx` driver) a maximum of three services can be combined. The order of services is not significant. For instance, `sym;asym` is functionally equivalent to `asym;sym`. To create a provisioning `configMap`, run the following command before deploying initcontainer: @@ -215,7 +217,7 @@ In order to utilise the QAT device plugin, QuickAssist SR-IOV virtual functions You can verify this on your nodes by checking for the relevant PCI identifiers: ```bash -for i in 0442 0443 18a1 37c9 6f55 19e3 4941 4943 4945 4947; do lspci -d 8086:$i; done +for i in 0442 0443 18a1 37c9 6f55 19e3 4941 4943 4945 4947 4949; do lspci -d 8086:$i; done ``` [1]:https://www-ssl.intel.com/content/www/us/en/design/products-and-solutions/processors-and-chipsets/purley/intel-xeon-scalable-processors.html diff --git a/cmd/qat_plugin/dpdkdrv/dpdkdrv.go b/cmd/qat_plugin/dpdkdrv/dpdkdrv.go index 1ee5cf751..a482e244e 100644 --- a/cmd/qat_plugin/dpdkdrv/dpdkdrv.go +++ b/cmd/qat_plugin/dpdkdrv/dpdkdrv.go @@ -66,6 +66,7 @@ var qatDeviceDriver = map[string]string{ "4943": "4xxxvf", "4945": "4xxxvf", "4947": "420xxvf", + "4949": "6xxxvf", "37c9": "c6xxvf", "6f55": "d15xxvf", } @@ -352,7 +353,7 @@ func readDeviceConfiguration(pfDev string) string { } if err2 == nil && len(qatCfgServices) != 0 { - return strings.TrimSpace(string(qatCfgServices)) + return strings.Join(strings.SplitN(strings.TrimSpace(string(qatCfgServices)), ";", 3), "-") } } @@ -392,8 +393,7 @@ func getDeviceHealthiness(device string, lookup map[string]string) string { hbStatusFile := filepath.Join(filepath.Dir(filepath.Join(pfDev, "../../")), "kernel/debug", fmt.Sprintf("qat_%s_%s/heartbeat/status", driver, filepath.Base(pfDev))) - // If status reads "-1", the device is considered bad: - // https://github.com/torvalds/linux/blob/v6.6-rc5/Documentation/ABI/testing/debugfs-driver-qat + // If status reads "-1", the device is considered bad. if data, err := os.ReadFile(hbStatusFile); err == nil && strings.Split(string(data), "\n")[0] == "-1" { healthiness = pluginapi.Unhealthy } @@ -414,6 +414,7 @@ func getDeviceCapabilities(device string) (string, error) { "4943": {}, // QAT Gen4 (401xx) VF PCI ID "4945": {}, // QAT Gen4 (402xx) VF PCI ID "4947": {}, // QAT Gen4 (420xx) VF PCI ID + "4949": {}, // QAT Gen6 (6xxx) VF PCI ID } if _, ok := devicesWithCapabilities[devID]; !ok { @@ -426,27 +427,14 @@ func getDeviceCapabilities(device string) (string, error) { return defaultCapabilities, nil } - switch readDeviceConfiguration(pfDev) { - case "sym;asym": + services := readDeviceConfiguration(pfDev) + switch services { + case "sym-asym": + fallthrough + case "asym-sym": return "cy", nil - case "asym;sym": - return "cy", nil - case "dc": - return "dc", nil - case "sym": - return "sym", nil - case "asym": - return "asym", nil - case "asym;dc": - return "asym-dc", nil - case "dc;asym": - return "asym-dc", nil - case "sym;dc": - return "sym-dc", nil - case "dc;sym": - return "sym-dc", nil default: - return defaultCapabilities, nil + return services, nil } } diff --git a/cmd/qat_plugin/dpdkdrv/dpdkdrv_test.go b/cmd/qat_plugin/dpdkdrv/dpdkdrv_test.go index b60424c2b..f2eb5bac2 100644 --- a/cmd/qat_plugin/dpdkdrv/dpdkdrv_test.go +++ b/cmd/qat_plugin/dpdkdrv/dpdkdrv_test.go @@ -484,6 +484,34 @@ func TestScan(t *testing.T) { maxDevNum: 1, expectedDevNum: 1, }, + { + name: "vfio-pci DPDKdriver with no kernel bound driver and where vfdevID is equal to qatDevId (4949), PF with decomp capabilities from sysfs", + dpdkDriver: "vfio-pci", + kernelVfDrivers: []string{"6xxxvf"}, + dirs: []string{ + "sys/bus/pci/drivers/6xxx", + "sys/bus/pci/drivers/vfio-pci", + "sys/devices/pci0000:02/0000:02:00.0", + "sys/devices/pci0000:02/0000:02:00.0/qat", + "sys/kernel/debug/qat_6xxx_0000:02:00.0", + "sys/bus/pci/devices/0000:02:01.0", + }, + files: map[string][]byte{ + "sys/devices/pci0000:02/0000:02:00.0/device": []byte("0x4948"), + "sys/devices/pci0000:02/0000:02:00.0/qat/state": []byte("up"), + "sys/devices/pci0000:02/0000:02:00.0/qat/cfg_services": []byte("decomp"), + "sys/bus/pci/devices/0000:02:01.0/device": []byte("0x4949"), + }, + symlinks: map[string]string{ + "sys/bus/pci/devices/0000:02:01.0/iommu_group": "sys/kernel/iommu_groups/vfiotestfile", + "sys/bus/pci/devices/0000:02:01.0/physfn": "sys/devices/pci0000:02/0000:02:00.0", + "sys/bus/pci/drivers/6xxx/0000:02:00.0": "sys/devices/pci0000:02/0000:02:00.0", + "sys/bus/pci/devices/0000:02:00.0": "sys/devices/pci0000:02/0000:02:00.0", + "sys/devices/pci0000:02/0000:02:00.0/virtfn0": "sys/bus/pci/devices/0000:02:01.0", + }, + maxDevNum: 1, + expectedDevNum: 1, + }, { name: "vfio-pci DPDKdriver with no kernel bound driver and where vfdevID is equal to qatDevId (4941), two PFs with dc and cy capabilities", dpdkDriver: "vfio-pci", diff --git a/cmd/qat_plugin/qat_plugin.go b/cmd/qat_plugin/qat_plugin.go index f60f45583..8e407b42f 100644 --- a/cmd/qat_plugin/qat_plugin.go +++ b/cmd/qat_plugin/qat_plugin.go @@ -35,7 +35,7 @@ func main() { ) dpdkDriver := flag.String("dpdk-driver", "vfio-pci", "DPDK Device driver for configuring the QAT device") - kernelVfDrivers := flag.String("kernel-vf-drivers", "4xxxvf,420xxvf", "Comma separated VF Device Driver of the QuickAssist Devices in the system. Devices supported: DH895xCC, C62x, C3xxx, C4xxx, 4xxx, 420xxx, and D15xx") + kernelVfDrivers := flag.String("kernel-vf-drivers", "4xxxvf,420xxvf", "Comma separated VF Device Driver of the QuickAssist Devices in the system. Devices supported: DH895xCC, C62x, C3xxx, C4xxx, 4xxx, 420xxx, 6xxx, and D15xx") preferredAllocationPolicy := flag.String("allocation-policy", "", "Modes of allocating QAT devices: balanced and packed") maxNumDevices := flag.Int("max-num-devices", 64, "maximum number of QAT devices to be provided to the QuickAssist device plugin") flag.Parse() diff --git a/demo/qat-autoreset.sh b/demo/qat-autoreset.sh index 49cd36d5a..d6843aa16 100755 --- a/demo/qat-autoreset.sh +++ b/demo/qat-autoreset.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash NODE_NAME="${NODE_NAME:-}" -ENABLED_QAT_PF_PCIIDS=${ENABLED_QAT_PF_PCIIDS:-37c8 4940 4942 4944 4946} +ENABLED_QAT_PF_PCIIDS=${ENABLED_QAT_PF_PCIIDS:-37c8 4940 4942 4944 4946 4948} AUTORESET_ENABLED="NONE" AUTORESET_ENABLED_FOUND="FALSE" diff --git a/demo/qat-init.sh b/demo/qat-init.sh index a3ad6a842..adc6b80fe 100755 --- a/demo/qat-init.sh +++ b/demo/qat-init.sh @@ -1,12 +1,14 @@ #!/usr/bin/env bash # This script is based on qatlib's qat_init.sh NODE_NAME="${NODE_NAME:-}" -ENABLED_QAT_PF_PCIIDS=${ENABLED_QAT_PF_PCIIDS:-37c8 4940 4942 4944 4946} -SERVICES_LIST="sym asym sym;asym dc sym;dc asym;dc" +ENABLED_QAT_PF_PCIIDS=${ENABLED_QAT_PF_PCIIDS:-37c8 4940 4942 4944 4946 4948} +# TODO: check against qatlib +SERVICES_LIST="sym asym sym;asym dc sym;dc asym;dc dcc decomp asym;sym;dc asym;sym;decomp" QAT_4XXX_DEVICE_PCI_ID="0x4940" QAT_401XX_DEVICE_PCI_ID="0x4942" QAT_402XX_DEVICE_PCI_ID="0x4944" QAT_420XX_DEVICE_PCI_ID="0x4946" +QAT_6XXX_DEVICE_PCI_ID="0x4948" SERVICES_ENABLED="NONE" SERVICES_ENABLED_FOUND="FALSE" @@ -39,7 +41,7 @@ sysfs_config() { if [ "$SERVICES_ENABLED_FOUND" = "TRUE" ]; then for DEVPATH in $DEVS; do PCI_DEV=$(cat "$DEVPATH"/device 2> /dev/null) - if [ "$PCI_DEV" != "$QAT_4XXX_DEVICE_PCI_ID" ] && [ "$PCI_DEV" != "$QAT_401XX_DEVICE_PCI_ID" ] && [ "$PCI_DEV" != "$QAT_402XX_DEVICE_PCI_ID" ] && [ "$PCI_DEV" != "$QAT_420XX_DEVICE_PCI_ID" ]; then + if [ "$PCI_DEV" != "$QAT_4XXX_DEVICE_PCI_ID" ] && [ "$PCI_DEV" != "$QAT_401XX_DEVICE_PCI_ID" ] && [ "$PCI_DEV" != "$QAT_402XX_DEVICE_PCI_ID" ] && [ "$PCI_DEV" != "$QAT_420XX_DEVICE_PCI_ID" ] && [ "$PCI_DEV" != "$QAT_6XXX_DEVICE_PCI_ID" ]; then continue fi diff --git a/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml b/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml index 0a342d6c1..239965a96 100644 --- a/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml +++ b/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: acceleratorfunctions.fpga.intel.com spec: group: fpga.intel.com diff --git a/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml b/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml index 4ff325002..45d1a9f06 100644 --- a/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml +++ b/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: fpgaregions.fpga.intel.com spec: group: fpga.intel.com diff --git a/deployments/nfd/overlays/node-feature-rules/node-feature-rules.yaml b/deployments/nfd/overlays/node-feature-rules/node-feature-rules.yaml index ed78525f0..8686a23ed 100644 --- a/deployments/nfd/overlays/node-feature-rules/node-feature-rules.yaml +++ b/deployments/nfd/overlays/node-feature-rules/node-feature-rules.yaml @@ -95,7 +95,7 @@ spec: - feature: pci.device matchExpressions: vendor: {op: In, value: ["8086"]} - device: {op: In, value: ["37c8", "4940", "4942", "4944", "4946"]} + device: {op: In, value: ["37c8", "4940", "4942", "4944", "4946", "4948"]} class: {op: In, value: ["0b40"]} - feature: kernel.loadedmodule matchExpressions: diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml index 0af534da7..58806c330 100644 --- a/deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml +++ b/deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: dlbdeviceplugins.deviceplugin.intel.com spec: group: deviceplugin.intel.com diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml index 4d27e2ca7..8c492a73d 100644 --- a/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml +++ b/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: dsadeviceplugins.deviceplugin.intel.com spec: group: deviceplugin.intel.com diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml index bdd39c855..0d10efea7 100644 --- a/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml +++ b/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: fpgadeviceplugins.deviceplugin.intel.com spec: group: deviceplugin.intel.com diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml index 813abc6f4..dd64894da 100644 --- a/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml +++ b/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: gpudeviceplugins.deviceplugin.intel.com spec: group: deviceplugin.intel.com diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml index 263d9bde2..e66d42fdc 100644 --- a/deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml +++ b/deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: iaadeviceplugins.deviceplugin.intel.com spec: group: deviceplugin.intel.com diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_npudeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_npudeviceplugins.yaml index 45d1fc7ef..b9d3f5e7b 100644 --- a/deployments/operator/crd/bases/deviceplugin.intel.com_npudeviceplugins.yaml +++ b/deployments/operator/crd/bases/deviceplugin.intel.com_npudeviceplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: npudeviceplugins.deviceplugin.intel.com spec: group: deviceplugin.intel.com diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml index ace89d8fd..8c0c16688 100644 --- a/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml +++ b/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: qatdeviceplugins.deviceplugin.intel.com spec: group: deviceplugin.intel.com @@ -83,6 +83,7 @@ spec: - 4xxxvf - 420xxvf - c4xxxvf + - 6xxxvf type: string type: array logLevel: diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml index f883bd211..a50a2354b 100644 --- a/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml +++ b/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: sgxdeviceplugins.deviceplugin.intel.com spec: group: deviceplugin.intel.com diff --git a/deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml b/deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml index 0a342d6c1..239965a96 100644 --- a/deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml +++ b/deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: acceleratorfunctions.fpga.intel.com spec: group: fpga.intel.com diff --git a/deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml b/deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml index 4ff325002..45d1a9f06 100644 --- a/deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml +++ b/deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.0 + controller-gen.kubebuilder.io/version: v0.18.0 name: fpgaregions.fpga.intel.com spec: group: fpga.intel.com diff --git a/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml b/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml deleted file mode 100644 index bb7f7a0e4..000000000 --- a/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: intel-qat-kernel-plugin - labels: - app: intel-qat-kernel-plugin -spec: - selector: - matchLabels: - app: intel-qat-kernel-plugin - updateStrategy: - type: RollingUpdate - rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 - template: - metadata: - labels: - app: intel-qat-kernel-plugin - spec: - containers: - - name: intel-qat-kernel-plugin - securityContext: - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - privileged: true - image: intel/intel-qat-plugin:devel - imagePullPolicy: IfNotPresent - args: ["-mode", "kernel"] - volumeMounts: - - name: devfs - mountPath: /dev - - name: etcdir - mountPath: /etc - readOnly: true - - name: kubeletsockets - mountPath: /var/lib/kubelet/device-plugins - volumes: - - name: etcdir - hostPath: - path: /etc - - name: kubeletsockets - hostPath: - path: /var/lib/kubelet/device-plugins - - name: devfs - hostPath: - path: /dev - nodeSelector: - kubernetes.io/arch: amd64 diff --git a/pkg/apis/deviceplugin/v1/qatdeviceplugin_types.go b/pkg/apis/deviceplugin/v1/qatdeviceplugin_types.go index 814911ab2..2199889b3 100644 --- a/pkg/apis/deviceplugin/v1/qatdeviceplugin_types.go +++ b/pkg/apis/deviceplugin/v1/qatdeviceplugin_types.go @@ -21,7 +21,7 @@ import ( // NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. -// +kubebuilder:validation:Enum={"dh895xccvf","c6xxvf","c3xxxvf","d15xxvf","4xxxvf", "420xxvf", "c4xxxvf"} +// +kubebuilder:validation:Enum={"dh895xccvf","c6xxvf","c3xxxvf","d15xxvf","4xxxvf", "420xxvf", "c4xxxvf", "6xxxvf"} // KernelVfDriver is a VF device driver for QuickAssist devices. type KernelVfDriver string