Add support to ShmSize in Pods with Quadlet

This closes containers#22915 Signed-off-by: Odilon Sousa <[email protected]>
Odilhao · Dec 23, 2024 · a083f93 · a083f93
1 parent d3cd509
commit a083f93
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/docs/source/markdown/podman-systemd.unit.5.md b/docs/source/markdown/podman-systemd.unit.5.md
@@ -953,6 +953,7 @@ Valid options for `[Pod]` are listed below:
 | PodName=name                        | --name=name                            |
 | PublishPort=8080:80                 | --publish 8080:80                      |
 | ServiceName=name                    | Name the systemd unit `name.service`   |
+| ShmSize=100m                        | --shm-size=100m                       |
 | SubGIDMap=gtest                     | --subgidname=gtest                     |
 | SubUIDMap=utest                     | --subuidname=utest                     |
 | UIDMap=0:10000:10                   | --uidmap=0:10000:10                    |
@@ -1092,6 +1093,12 @@ Setting this key overrides this behavior by instructing Quadlet to use the provi
 
 Note, the name should not include the `.service` file extension
 
+### `ShmSize=`
+
+Size of /dev/shm.
+
+This is equivalent to the Podman `--shm-size` option and generally has the form `number[unit]`
+
 ### `SubGIDMap=`
 
 Create the pod in a new user namespace using the map with name in the /etc/subgid file.

diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
@@ -413,6 +413,7 @@ var (
 		KeyRemapUidSize:         true,
 		KeyRemapUsers:           true,
 		KeyServiceName:          true,
+		KeyShmSize:              true,
 		KeySubGIDMap:            true,
 		KeySubUIDMap:            true,
 		KeyUIDMap:               true,
@@ -1650,6 +1651,11 @@ func ConvertPod(podUnit *parser.UnitFile, name string, unitsInfoMap map[string]*
 	execStartPre.add("--infra-name", fmt.Sprintf("%s-infra", podName))
 	execStartPre.add("--name", podName)
 
+	shmSize := podUnit.LookupAll(PodGroup, KeyShmSize)
+	if len(shmSize) > 0 {
+		execStartPre.addf("--shm-size=%s", shmSize[0])
+	}
+
 	handlePodmanArgs(podUnit, PodGroup, execStartPre)
 
 	service.AddCmdline(ServiceGroup, "ExecStartPre", execStartPre.Args)

diff --git a/test/e2e/quadlet/shmsize.pod b/test/e2e/quadlet/shmsize.pod
@@ -0,0 +1,4 @@
+## assert-podman-pre-args "--shm-size=5g"
+
+[Pod]
+ShmSize=5g
diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go
@@ -1042,6 +1042,7 @@ BOGUS=foo
 		Entry("Pod - Remap auto2", "remap-auto2.pod"),
 		Entry("Pod - Remap keep-id", "remap-keep-id.pod"),
 		Entry("Pod - Remap manual", "remap-manual.pod"),
+		Entry("Pod - Shm Size", "shmsize.pod"),
 	)
 
 	DescribeTable("Running expected warning quadlet test case",