Merge pull request #22177 from mheon/fix_22172

Add rootless network command to `podman info`
containers · Mar 26, 2024 · 25ebf10 · 25ebf10
2 parents 5c39ddc + b56331c
commit 25ebf10
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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