Skip to content

Commit 14f6ebf

Browse files
committed
[sr-iov] Update to 4.20
1 parent 60797a9 commit 14f6ebf

File tree

5 files changed

+25
-16
lines changed

5 files changed

+25
-16
lines changed

sr-iov/cni

Submodule cni updated from 6d91592 to ff7ba1f

sr-iov/infiniband-cni

sr-iov/operator

sr-iov/patches/cni.patch

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
From b817eb507be9d66306b12e7b87391768d5639355 Mon Sep 17 00:00:00 2001
1+
From f6b3b91899e62dd8dc6f121d9b2871158e4a2591 Mon Sep 17 00:00:00 2001
22
From: Owen Howard <owen@ziax.com>
33
Date: Tue, 4 Nov 2025 14:46:54 +0000
44
Subject: [PATCH] OKDify
55

66
---
7-
images/entrypoint.sh | 3 +++
8-
1 file changed, 3 insertions(+)
7+
images/entrypoint.sh | 5 ++++-
8+
1 file changed, 4 insertions(+), 1 deletion(-)
99

1010
diff --git a/images/entrypoint.sh b/images/entrypoint.sh
11-
index e1bd117..27b95a7 100755
11+
index e1bd117..61881d4 100755
1212
--- a/images/entrypoint.sh
1313
+++ b/images/entrypoint.sh
14+
@@ -1,7 +1,7 @@
15+
#!/bin/sh
16+
17+
# Always exit on errors.
18+
-set -e
19+
+set -eox pipefail
20+
21+
# Give help text for parameters.
22+
usage()
1423
@@ -58,6 +58,9 @@ get_source_folder_for_rhel_version()
1524
9)
1625
sourcedir=/usr/bin/rhel9
@@ -22,5 +31,5 @@ index e1bd117..27b95a7 100755
2231
echo "ERROR: RHEL Major Version Unsupported, rhelmajor=${rhelmajor}"
2332
;;
2433
--
25-
2.51.0
34+
2.51.1
2635

sr-iov/patches/operator.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From cc47969fb24208c4501597a4cd46ce475580ed88 Mon Sep 17 00:00:00 2001
1+
From 55372c53747e36e7e473b9d1bdaf87e0f2b487c8 Mon Sep 17 00:00:00 2001
22
From: Owen Howard <owen@ziax.com>
33
Date: Sat, 10 May 2025 14:45:56 +0100
44
Subject: [PATCH] OKDify
@@ -8,19 +8,19 @@ Subject: [PATCH] OKDify
88
1 file changed, 5 insertions(+), 5 deletions(-)
99

1010
diff --git a/config/manifests/bases/sriov-network-operator.clusterserviceversion.yaml b/config/manifests/bases/sriov-network-operator.clusterserviceversion.yaml
11-
index 416329c64..ddc9bdfe4 100644
11+
index 47ab3ef4d..73a323225 100644
1212
--- a/config/manifests/bases/sriov-network-operator.clusterserviceversion.yaml
1313
+++ b/config/manifests/bases/sriov-network-operator.clusterserviceversion.yaml
1414
@@ -9,7 +9,7 @@ metadata:
15-
containerImage: quay.io/openshift/origin-sriov-network-operator:4.18
15+
containerImage: quay.io/openshift/origin-sriov-network-operator:4.20
1616
createdAt: 2019/04/30
1717
description: An operator for configuring SR-IOV components and initializing SRIOV
1818
- network devices in Openshift cluster.
1919
+ network devices in an OKD cluster.
2020
features.operators.openshift.io/cnf: "false"
2121
features.operators.openshift.io/cni: "true"
2222
features.operators.openshift.io/csi: "false"
23-
@@ -51,7 +51,7 @@ metadata:
23+
@@ -54,7 +54,7 @@ metadata:
2424
}
2525
operators.operatorframework.io/internal-objects: '["sriovnetworknodestates.sriovnetwork.openshift.io"]'
2626
repository: https://github.com/k8snetworkplumbingwg/sriov-network-operator
@@ -29,7 +29,7 @@ index 416329c64..ddc9bdfe4 100644
2929
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
3030
labels:
3131
operatorframework.io/arch.amd64: supported
32-
@@ -97,10 +97,10 @@ spec:
32+
@@ -100,10 +100,10 @@ spec:
3333
name: sriovoperatorconfigs.sriovnetwork.openshift.io
3434
version: v1
3535
description: |
@@ -42,13 +42,13 @@ index 416329c64..ddc9bdfe4 100644
4242

4343
### Supported Features
4444
* Initialize the SR-IOV NICs on nodes.
45-
@@ -156,5 +156,5 @@ spec:
45+
@@ -159,5 +159,5 @@ spec:
4646
- email: support@redhat.com
4747
name: Red Hat
4848
provider:
4949
- name: Red Hat
5050
+ name: OKD Community
51-
version: 4.18.0
51+
version: 4.20.0
5252
--
53-
2.51.0
53+
2.51.1
5454

0 commit comments

Comments
 (0)