From c7fe450ae3e9d0af83fc43e11ee130f9dc8368a8 Mon Sep 17 00:00:00 2001 From: Andrea Panattoni Date: Thu, 23 Nov 2023 10:54:45 +0100 Subject: [PATCH] Update bundles with command `make -f Makefile.bundle generate bundle` Synced fields - `SriovNetwork.Spec.LogLevel` - `SriovNetwork.Spec.LogFile` - `SriovOperatorConfigs.Spec.UseCDI` Signed-off-by: Andrea Panattoni --- ...network-operator.clusterserviceversion.yaml | 2 +- ...riovnetwork.openshift.io_sriovnetworks.yaml | 18 ++++++++++++++++++ ...work.openshift.io_sriovoperatorconfigs.yaml | 4 ++++ .../supported-nic-ids_v1_configmap.yaml | 2 +- ...network-operator.clusterserviceversion.yaml | 2 +- ...riovnetwork.openshift.io_sriovnetworks.yaml | 18 ++++++++++++++++++ ...work.openshift.io_sriovoperatorconfigs.yaml | 4 ++++ 7 files changed, 47 insertions(+), 3 deletions(-) diff --git a/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml b/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml index d60e98d9d..957e52e30 100644 --- a/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml +++ b/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml @@ -100,7 +100,7 @@ metadata: categories: Networking certified: "false" containerImage: quay.io/openshift/origin-sriov-network-operator:4.15 - createdAt: "2023-10-23T08:39:21Z" + createdAt: "2023-11-23T09:50:54Z" description: An operator for configuring SR-IOV components and initializing SRIOV network devices in Openshift cluster. olm.skipRange: '>=4.3.0-0 <4.15.0' diff --git a/bundle/manifests/sriovnetwork.openshift.io_sriovnetworks.yaml b/bundle/manifests/sriovnetwork.openshift.io_sriovnetworks.yaml index d1b14e314..0c1034923 100644 --- a/bundle/manifests/sriovnetwork.openshift.io_sriovnetworks.yaml +++ b/bundle/manifests/sriovnetwork.openshift.io_sriovnetworks.yaml @@ -48,6 +48,24 @@ spec: - enable - disable type: string + logFile: + description: LogFile sets the log file of the SRIOV CNI plugin logs. + If unset (default), this will log to stderr and thus to multus and + container runtime logs. + type: string + logLevel: + default: info + description: LogLevel sets the log level of the SRIOV CNI plugin - + either of panic, error, warning, info, debug. Defaults to info if + left blank. + enum: + - panic + - error + - warning + - info + - debug + - "" + type: string maxTxRate: description: Maximum tx rate, in Mbps, for the VF. Defaults to 0 (no rate limiting) diff --git a/bundle/manifests/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml b/bundle/manifests/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml index 53cf392a5..ad7a136a8 100644 --- a/bundle/manifests/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml +++ b/bundle/manifests/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml @@ -71,6 +71,10 @@ spec: maximum: 2 minimum: 0 type: integer + useCDI: + description: Flag to enable Container Device Interface mode for SR-IOV + Network Device Plugin + type: boolean type: object status: description: SriovOperatorConfigStatus defines the observed state of SriovOperatorConfig diff --git a/bundle/manifests/supported-nic-ids_v1_configmap.yaml b/bundle/manifests/supported-nic-ids_v1_configmap.yaml index 7978b57d0..1e3cad2df 100644 --- a/bundle/manifests/supported-nic-ids_v1_configmap.yaml +++ b/bundle/manifests/supported-nic-ids_v1_configmap.yaml @@ -29,8 +29,8 @@ data: Qlogic_qede_QL41000: 1077 8070 8090 Qlogic_qede_QL45000_25G: 1077 1656 1664 Qlogic_qede_QL45000_50G: 1077 1654 1664 - Red_Hat_Virtio_network_device: 1af4 1000 1000 Red_Hat_Virtio_1_0_network_device: 1af4 1041 1041 + Red_Hat_Virtio_network_device: 1af4 1000 1000 kind: ConfigMap metadata: name: supported-nic-ids diff --git a/manifests/stable/sriov-network-operator.clusterserviceversion.yaml b/manifests/stable/sriov-network-operator.clusterserviceversion.yaml index d60e98d9d..957e52e30 100644 --- a/manifests/stable/sriov-network-operator.clusterserviceversion.yaml +++ b/manifests/stable/sriov-network-operator.clusterserviceversion.yaml @@ -100,7 +100,7 @@ metadata: categories: Networking certified: "false" containerImage: quay.io/openshift/origin-sriov-network-operator:4.15 - createdAt: "2023-10-23T08:39:21Z" + createdAt: "2023-11-23T09:50:54Z" description: An operator for configuring SR-IOV components and initializing SRIOV network devices in Openshift cluster. olm.skipRange: '>=4.3.0-0 <4.15.0' diff --git a/manifests/stable/sriovnetwork.openshift.io_sriovnetworks.yaml b/manifests/stable/sriovnetwork.openshift.io_sriovnetworks.yaml index d1b14e314..0c1034923 100644 --- a/manifests/stable/sriovnetwork.openshift.io_sriovnetworks.yaml +++ b/manifests/stable/sriovnetwork.openshift.io_sriovnetworks.yaml @@ -48,6 +48,24 @@ spec: - enable - disable type: string + logFile: + description: LogFile sets the log file of the SRIOV CNI plugin logs. + If unset (default), this will log to stderr and thus to multus and + container runtime logs. + type: string + logLevel: + default: info + description: LogLevel sets the log level of the SRIOV CNI plugin - + either of panic, error, warning, info, debug. Defaults to info if + left blank. + enum: + - panic + - error + - warning + - info + - debug + - "" + type: string maxTxRate: description: Maximum tx rate, in Mbps, for the VF. Defaults to 0 (no rate limiting) diff --git a/manifests/stable/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml b/manifests/stable/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml index 53cf392a5..ad7a136a8 100644 --- a/manifests/stable/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml +++ b/manifests/stable/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml @@ -71,6 +71,10 @@ spec: maximum: 2 minimum: 0 type: integer + useCDI: + description: Flag to enable Container Device Interface mode for SR-IOV + Network Device Plugin + type: boolean type: object status: description: SriovOperatorConfigStatus defines the observed state of SriovOperatorConfig