Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/v1.1] scripts: use coordinator rules/settings for bare metal #1000

Merged
merged 2 commits into from
Nov 13, 2024
Merged

[release/v1.1] scripts: use coordinator rules/settings for bare metal #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55fb9ed
scripts: use coordinator rules/settings for bare metal
katexochen Nov 13, 2024
f127c2e
kata.genpolicy: fix rules-coordinator patch
katexochen Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/by-name/kata/genpolicy/genpolicy_rules_coordinator.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/genpolicy-rules.rego b/genpolicy-rules.rego
index c3eb334..a796740 100644
index 823e5e76d55bac47ad9c79d8916f92702efa316d..e3acc09dd931fd8d028eadf356679a97dfa4e633 100644
--- a/genpolicy-rules.rego
+++ b/genpolicy-rules.rego
@@ -164,9 +164,9 @@ allow_by_sandbox_name(p_oci, i_oci, p_storages, i_storages, s_name) {
@@ -199,9 +199,9 @@ allow_by_sandbox_name(p_container, i_oci, i_storages, s_name) {
p_namespace := p_oci.Annotations[s_namespace]
i_namespace := i_oci.Annotations[s_namespace]
print("allow_by_sandbox_name: p_namespace =", p_namespace, "i_namespace =", i_namespace)
Expand All @@ -11,5 +11,5 @@ index c3eb334..a796740 100644

- allow_by_container_types(p_oci, i_oci, s_name, p_namespace)
+ allow_by_container_types(p_oci, i_oci, s_name, i_namespace)
allow_by_bundle_or_sandbox_id(p_oci, i_oci, p_storages, i_storages)
allow_by_bundle_or_sandbox_id(p_container, i_oci, i_storages)
allow_process(p_oci, i_oci, s_name)
4 changes: 2 additions & 2 deletions packages/scripts.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@
${pkgs.microsoft.genpolicy}/bin/genpolicy < "$tmpdir/coordinator_base.yml"
;;
"k3s-qemu-snp"|"k3s-qemu-tdx"|"rke2-qemu-tdx")
cp ${pkgs.kata.genpolicy.rules}/genpolicy-rules.rego rules.rego
cp ${pkgs.kata.genpolicy.settings}/genpolicy-settings.json .
cp ${pkgs.kata.genpolicy.rules-coordinator}/genpolicy-rules.rego rules.rego
cp ${pkgs.kata.genpolicy.settings-coordinator}/genpolicy-settings.json .
${pkgs.kata.genpolicy}/bin/genpolicy < "$tmpdir/coordinator_base.yml"
;;
*)
Expand Down