Skip to content

Commit b24f3f9

Browse files
committed
kata/runtime: fix VFIO annotation rule
With the CDI configuration written by the kata-manager, the VFIO annotations are not strictly double-digit anymore. Therefore, we just match for any amount of digits.
1 parent 96ec708 commit b24f3f9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packages/by-name/kata/runtime/0009-genpolicy-support-dynamic-annotations.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ where `XY` corresponds to a dynamic ID.
1515
3 files changed, 25 insertions(+), 8 deletions(-)
1616

1717
diff --git a/src/tools/genpolicy/genpolicy-settings.json b/src/tools/genpolicy/genpolicy-settings.json
18-
index f98ae153733569012bee35c8e6f197f621edb178..84e0738f4e1326babad93402eb750268238ab77e 100644
18+
index f98ae153733569012bee35c8e6f197f621edb178..2dbc8160413d54116e581a7566020ea2fcbc62e3 100644
1919
--- a/src/tools/genpolicy/genpolicy-settings.json
2020
+++ b/src/tools/genpolicy/genpolicy-settings.json
2121
@@ -293,7 +293,10 @@
@@ -25,7 +25,7 @@ index f98ae153733569012bee35c8e6f197f621edb178..84e0738f4e1326babad93402eb750268
2525
- "image_layer_verification" : "none"
2626
+ "image_layer_verification" : "none",
2727
+ "dynamic_annotations": {
28-
+ "^cdi\\.k8s\\.io\\/vfio[0-9]{2}$": "^nvidia.com/gpu=[0-9]+$"
28+
+ "^cdi\\.k8s\\.io\\/vfio[0-9]+$": "^nvidia.com/gpu=[0-9]+$"
2929
+ }
3030
},
3131
"kata_config": {

packages/by-name/kata/runtime/0012-genpolicy-don-t-allow-mount-storage-for-declared-VOL.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Signed-off-by: Markus Rudy <mr@edgeless.systems>
1212
4 files changed, 8 insertions(+), 62 deletions(-)
1313

1414
diff --git a/src/tools/genpolicy/genpolicy-settings.json b/src/tools/genpolicy/genpolicy-settings.json
15-
index 84e0738f4e1326babad93402eb750268238ab77e..98365292a918233a1fbb47128cca77bb0f2e1870 100644
15+
index 2dbc8160413d54116e581a7566020ea2fcbc62e3..5861b483e0b3c910ce82fe72b8384f965ef06c85 100644
1616
--- a/src/tools/genpolicy/genpolicy-settings.json
1717
+++ b/src/tools/genpolicy/genpolicy-settings.json
1818
@@ -183,18 +183,6 @@

0 commit comments

Comments
 (0)