From b56331cd2f4342ebee49b6e321a8d141df7ba002 Mon Sep 17 00:00:00 2001 From: Matt Heon Date: Tue, 26 Mar 2024 09:36:19 -0400 Subject: [PATCH] Add rootless network command to `podman info` Useful to tell whether containers are being made with pasta or slirp4netns by default. Info is bloated enough already that I don't really have concerns about shoving more into it. Fixes #22172 Signed-off-by: Matt Heon --- libpod/define/info.go | 6 ++++-- libpod/info.go | 1 + test/system/005-info.bats | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libpod/define/info.go b/libpod/define/info.go index 564aad4b9a..bc37d81396 100644 --- a/libpod/define/info.go +++ b/libpod/define/info.go @@ -51,8 +51,10 @@ type HostInfo struct { OCIRuntime *OCIRuntimeInfo `json:"ociRuntime"` OS string `json:"os"` // RemoteSocket returns the UNIX domain socket the Podman service is listening on - RemoteSocket *RemoteSocket `json:"remoteSocket,omitempty"` - RuntimeInfo map[string]interface{} `json:"runtimeInfo,omitempty"` + RemoteSocket *RemoteSocket `json:"remoteSocket,omitempty"` + // RootlessNetworkCmd returns the default rootless network command (slirp4netns or pasta) + RootlessNetworkCmd string `json:"rootlessNetworkCmd"` + RuntimeInfo map[string]interface{} `json:"runtimeInfo,omitempty"` // ServiceIsRemote is true when the podman/libpod service is remote to the client ServiceIsRemote bool `json:"serviceIsRemote"` Security SecurityInfo `json:"security"` diff --git a/libpod/info.go b/libpod/info.go index 140b535ef7..24e2fd910e 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -126,6 +126,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) { NetworkBackend: r.config.Network.NetworkBackend, NetworkBackendInfo: r.network.NetworkInfo(), OS: runtime.GOOS, + RootlessNetworkCmd: r.config.Network.DefaultRootlessNetworkCmd, SwapFree: mi.SwapFree, SwapTotal: mi.SwapTotal, } diff --git a/test/system/005-info.bats b/test/system/005-info.bats index 020b351f95..2edbb26c4a 100644 --- a/test/system/005-info.bats +++ b/test/system/005-info.bats @@ -47,6 +47,7 @@ host.cgroupVersion | v[12] host.networkBackendInfo | .*dns.*package.* host.ociRuntime.path | $expr_path host.pasta | .*executable.*package.* +host.rootlessNetworkCmd | pasta store.configFile | $expr_path store.graphDriverName | [a-z0-9]\\\+\\\$ store.graphRoot | $expr_path