From 682defd62484839fc3d5348803f7b241a327cb0d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 09:44:36 +0300
Subject: T6219: Add support for container sysctl parameter (backport #3614)
 (#3629)

* container: T6219: Add support for container sysctl / kernel parameters

(cherry picked from commit 717ea64e4c54a8be619ffc29c16c6203b29319dd)

* T6219: align with system sysctl and limit parameters to supported

(cherry picked from commit f030464952168b553b5b3e29b461d437c2642a9b)

---------

Co-authored-by: Ben Pilgrim <ben@pilgrim.me.uk>
Co-authored-by: Nicolas Vollmar <nvollmar@gmail.com>
---
 smoketest/config-tests/container-simple | 1 +
 smoketest/configs/container-simple      | 5 +++++
 smoketest/scripts/cli/test_container.py | 5 +++++
 3 files changed, 11 insertions(+)

(limited to 'smoketest')

diff --git a/smoketest/config-tests/container-simple b/smoketest/config-tests/container-simple
index cc80ef4cf..5af365cf9 100644
--- a/smoketest/config-tests/container-simple
+++ b/smoketest/config-tests/container-simple
@@ -11,3 +11,4 @@ set container name c02 allow-host-networks
 set container name c02 allow-host-pid
 set container name c02 capability 'sys-time'
 set container name c02 image 'busybox:stable'
+set container name c02 sysctl parameter kernel.msgmax value '8192'
\ No newline at end of file
diff --git a/smoketest/configs/container-simple b/smoketest/configs/container-simple
index 82983afb7..b98a440b5 100644
--- a/smoketest/configs/container-simple
+++ b/smoketest/configs/container-simple
@@ -10,6 +10,11 @@ container {
         allow-host-pid
         cap-add sys-time
         image busybox:stable
+        sysctl {
+            parameter kernel.msgmax {
+                value "8192"
+            }
+        }
     }
 }
 interfaces {
diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py
index 90f821c60..3dd97a175 100755
--- a/smoketest/scripts/cli/test_container.py
+++ b/smoketest/scripts/cli/test_container.py
@@ -80,6 +80,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
 
         self.cli_set(base_path + ['name', cont_name, 'image', cont_image])
         self.cli_set(base_path + ['name', cont_name, 'allow-host-networks'])
+        self.cli_set(base_path + ['name', cont_name, 'sysctl', 'parameter', 'kernel.msgmax', 'value', '4096'])
 
         # commit changes
         self.cli_commit()
@@ -91,6 +92,10 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         # Check for running process
         self.assertEqual(process_named_running(PROCESS_NAME), pid)
 
+        # verify
+        tmp = cmd(f'sudo podman exec -it {cont_name} sysctl kernel.msgmax')
+        self.assertEqual(tmp, 'kernel.msgmax = 4096')
+
     def test_cpu_limit(self):
         cont_name = 'c2'
 
-- 
cgit v1.2.3