Change Quadlet Pod Stringkeys map function from lookupAndAddAllStrings

to lookupAndAddString to reflect the on the same usage in the other components. Update the e2e test. Signed-off-by: Odilon Sousa <[email protected]>
containers · Dec 26, 2024 · 2cd9f72 · 2cd9f72
1 parent bf3acc1
commit 2cd9f72
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
@@ -1630,10 +1630,11 @@ func ConvertPod(podUnit *parser.UnitFile, name string, unitsInfoMap map[string]*
 	}
 
 	stringsKeys := map[string]string{
-		KeyIP:  "--ip",
-		KeyIP6: "--ip6",
+		KeyIP:      "--ip",
+		KeyIP6:     "--ip6",
+		KeyShmSize: "--shm-size",
 	}
-	lookupAndAddAllStrings(podUnit, PodGroup, stringsKeys, execStartPre)
+	lookupAndAddString(podUnit, PodGroup, stringsKeys, execStartPre)
 
 	allStringsKeys := map[string]string{
 		KeyNetworkAlias: "--network-alias",
@@ -1651,11 +1652,6 @@ func ConvertPod(podUnit *parser.UnitFile, name string, unitsInfoMap map[string]*
 	execStartPre.add("--infra-name", fmt.Sprintf("%s-infra", podName))
 	execStartPre.add("--name", podName)
 
-	shmSize, exists := podUnit.Lookup(PodGroup, KeyShmSize)
-	if exists {
-		execStartPre.addf("--shm-size=%s", shmSize)
-	}
-
 	handlePodmanArgs(podUnit, PodGroup, execStartPre)
 
 	service.AddCmdline(ServiceGroup, "ExecStartPre", execStartPre.Args)

diff --git a/test/e2e/quadlet/shmsize.pod b/test/e2e/quadlet/shmsize.pod
@@ -1,4 +1,4 @@
-## assert-podman-pre-args "--shm-size=5g"
+## assert-podman-pre-args "--shm-size" "5g"
 
 [Pod]
 ShmSize=5g