Merge pull request openshift#891 from SchSeba/run_make_bundle

OCPBUGS-30558: Externally manage 4.14 update bundle
openshift-cherrypick-robot · Mar 14, 2024 · 9e3a6ec · 9e3a6ec
2 parents 7a362a5 + a6e5792
commit 9e3a6ec
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 3 deletions.
diff --git 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.14
-    createdAt: "2024-02-22T12:54:42Z"
+    createdAt: "2024-03-13T19:35:34Z"
     description: An operator for configuring SR-IOV components and initializing SRIOV
       network devices in Openshift cluster.
     olm.skipRange: '>=4.3.0-0 <4.14.0'

diff --git a/bundle/manifests/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml b/bundle/manifests/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml
@@ -52,6 +52,10 @@ spec:
                 description: Exclude device's NUMA node when advertising this resource
                   by SRIOV network device plugin. Default to false.
                 type: boolean
+              externallyManaged:
+                description: don't create the virtual function only allocated them
+                  to the device plugin. Defaults to false.
+                type: boolean
               isRdma:
                 description: RDMA mode. Defaults to false.
                 type: boolean

diff --git a/bundle/manifests/sriovnetwork.openshift.io_sriovnetworknodestates.yaml b/bundle/manifests/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
@@ -49,6 +49,8 @@ spec:
                   properties:
                     eSwitchMode:
                       type: string
+                    externallyManaged:
+                      type: boolean
                     linkType:
                       type: string
                     mtu:
@@ -124,6 +126,8 @@ spec:
                       type: string
                     eSwitchMode:
                       type: string
+                    externallyManaged:
+                      type: boolean
                     linkSpeed:
                       type: string
                     linkType:

diff --git 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
@@ -100,7 +100,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/openshift/origin-sriov-network-operator:4.14
-    createdAt: "2024-02-22T12:54:42Z"
+    createdAt: "2024-03-13T19:35:34Z"
     description: An operator for configuring SR-IOV components and initializing SRIOV
       network devices in Openshift cluster.
     olm.skipRange: '>=4.3.0-0 <4.14.0'

diff --git a/manifests/stable/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml b/manifests/stable/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml
@@ -52,6 +52,10 @@ spec:
                 description: Exclude device's NUMA node when advertising this resource
                   by SRIOV network device plugin. Default to false.
                 type: boolean
+              externallyManaged:
+                description: don't create the virtual function only allocated them
+                  to the device plugin. Defaults to false.
+                type: boolean
               isRdma:
                 description: RDMA mode. Defaults to false.
                 type: boolean

diff --git a/manifests/stable/sriovnetwork.openshift.io_sriovnetworknodestates.yaml b/manifests/stable/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
@@ -49,6 +49,8 @@ spec:
                   properties:
                     eSwitchMode:
                       type: string
+                    externallyManaged:
+                      type: boolean
                     linkType:
                       type: string
                     mtu:
@@ -124,6 +126,8 @@ spec:
                       type: string
                     eSwitchMode:
                       type: string
+                    externallyManaged:
+                      type: boolean
                     linkSpeed:
                       type: string
                     linkType: