Backport containers#525 to v4.8.2

feat: expose *ns keys to consumers, see: containers#525

Author: josegomezr

podman/domain/containers_create.py

@@ -406,6 +406,11 @@ def _render_payload(kwargs: MutableMapping[str, Any]) -> Dict[str, Any]:
         def pop(k):
             return args.pop(k, None)
 
+        def normalize_nsmode(mode: Union[str, Dict[str, str]]) -> Dict[str, str]:
+            if isinstance(mode, dict):
+                return mode
+            return {"nsmode": mode}
+
         def to_bytes(size: Union[int, str, None]) -> Union[int, None]:
             """
             Converts str or int to bytes.
@@ -694,22 +699,22 @@ def parse_host_port(_container_port, _protocol, _host):
             params["secret_env"] = args.pop("secret_env", {})
 
         if "cgroupns" in args:
-            params["cgroupns"] = {"nsmode": args.pop("cgroupns")}
+            params["cgroupns"] = normalize_nsmode(args.pop("cgroupns"))
 
         if "ipc_mode" in args:
-            params["ipcns"] = {"nsmode": args.pop("ipc_mode")}
+            params["ipcns"] = normalize_nsmode(args.pop("ipc_mode"))
 
         if "network_mode" in args:
-            params["netns"] = {"nsmode": args.pop("network_mode")}
+            params["netns"] = normalize_nsmode(args.pop("network_mode"))
 
         if "pid_mode" in args:
-            params["pidns"] = {"nsmode": args.pop("pid_mode")}
+            params["pidns"] = normalize_nsmode(args.pop("pid_mode"))
 
         if "userns_mode" in args:
-            params["userns"] = {"nsmode": args.pop("userns_mode")}
+            params["userns"] = normalize_nsmode(args.pop("userns_mode"))
 
         if "uts_mode" in args:
-            params["utsns"] = {"nsmode": args.pop("uts_mode")}
+            params["utsns"] = normalize_nsmode(args.pop("uts_mode"))
 
         if len(args) > 0:
             raise TypeError(