Merge pull request containers#11280 from Luap99/info-plugins

Podman info output plugin information
Luap99 · Aug 19, 2021 · 30b036c · 30b036c
2 parents f988cfe + 16dfce4
commit 30b036c
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 8 deletions.
diff --git a/libpod/container_log.go b/libpod/container_log.go
@@ -14,6 +14,13 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+// logDrivers stores the currently available log drivers, do not modify
+var logDrivers []string
+
+func init() {
+	logDrivers = append(logDrivers, define.KubernetesLogging, define.NoLogging)
+}
+
 // Log is a runtime function that can read one or more container logs.
 func (r *Runtime) Log(ctx context.Context, containers []*Container, options *logs.LogOptions, logChannel chan *logs.LogLine) error {
 	for _, ctr := range containers {

diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/podman/v3/libpod/define"
 	"github.com/containers/podman/v3/libpod/events"
 	"github.com/containers/podman/v3/libpod/logs"
 	"github.com/coreos/go-systemd/v22/sdjournal"
@@ -24,6 +25,10 @@ const (
 	journaldLogErr = "3"
 )
 
+func init() {
+	logDrivers = append(logDrivers, define.JournaldLogging)
+}
+
 func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOptions, logChannel chan *logs.LogLine) error {
 	journal, err := sdjournal.NewJournal()
 	if err != nil {

diff --git a/libpod/define/info.go b/libpod/define/info.go
@@ -8,6 +8,7 @@ type Info struct {
 	Host       *HostInfo              `json:"host"`
 	Store      *StoreInfo             `json:"store"`
 	Registries map[string]interface{} `json:"registries"`
+	Plugins    Plugins                `json:"plugins"`
 	Version    Version                `json:"version"`
 }
 
@@ -123,3 +124,11 @@ type ContainerStore struct {
 	Running int `json:"running"`
 	Stopped int `json:"stopped"`
 }
+
+type Plugins struct {
+	Volume  []string `json:"volume"`
+	Network []string `json:"network"`
+	Log     []string `json:"log"`
+	// FIXME what should we do with Authorization, docker seems to return nothing by default
+	// Authorization []string `json:"authorization"`
+}
diff --git a/libpod/info.go b/libpod/info.go
@@ -18,6 +18,7 @@ import (
 	"github.com/containers/image/v5/pkg/sysregistriesv2"
 	"github.com/containers/podman/v3/libpod/define"
 	"github.com/containers/podman/v3/libpod/linkmode"
+	"github.com/containers/podman/v3/libpod/network"
 	"github.com/containers/podman/v3/pkg/cgroups"
 	"github.com/containers/podman/v3/pkg/rootless"
 	"github.com/containers/storage"
@@ -65,6 +66,16 @@ func (r *Runtime) info() (*define.Info, error) {
 	if len(regs) > 0 {
 		registries["search"] = regs
 	}
+	volumePlugins := make([]string, 0, len(r.config.Engine.VolumePlugins)+1)
+	// the local driver always exists
+	volumePlugins = append(volumePlugins, "local")
+	for plugin := range r.config.Engine.VolumePlugins {
+		volumePlugins = append(volumePlugins, plugin)
+	}
+	info.Plugins.Volume = volumePlugins
+	// TODO move this into the new network interface
+	info.Plugins.Network = []string{network.BridgeNetworkDriver, network.MacVLANNetworkDriver}
+	info.Plugins.Log = logDrivers
 
 	info.Registries = registries
 	return &info, nil

diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go
@@ -102,14 +102,18 @@ func GetInfo(w http.ResponseWriter, r *http.Request) {
 		OomKillDisable:     sysInfo.OomKillDisable,
 		OperatingSystem:    infoData.Host.Distribution.Distribution,
 		PidsLimit:          sysInfo.PidsLimit,
-		Plugins:            docker.PluginsInfo{},
-		ProductLicense:     "Apache-2.0",
-		RegistryConfig:     new(registry.ServiceConfig),
-		RuncCommit:         docker.Commit{},
-		Runtimes:           getRuntimes(configInfo),
-		SecurityOptions:    getSecOpts(sysInfo),
-		ServerVersion:      versionInfo.Version,
-		SwapLimit:          sysInfo.SwapLimit,
+		Plugins: docker.PluginsInfo{
+			Volume:  infoData.Plugins.Volume,
+			Network: infoData.Plugins.Network,
+			Log:     infoData.Plugins.Log,
+		},
+		ProductLicense:  "Apache-2.0",
+		RegistryConfig:  new(registry.ServiceConfig),
+		RuncCommit:      docker.Commit{},
+		Runtimes:        getRuntimes(configInfo),
+		SecurityOptions: getSecOpts(sysInfo),
+		ServerVersion:   versionInfo.Version,
+		SwapLimit:       sysInfo.SwapLimit,
 		Swarm: swarm.Info{
 			LocalNodeState: swarm.LocalNodeStateInactive,
 		},

diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go
@@ -77,6 +77,15 @@ var _ = Describe("Podman Info", func() {
 		Expect(session.OutputToString()).To(ContainSubstring("registry"))
 	})
 
+	It("podman info --format GO template plugins", func() {
+		session := podmanTest.Podman([]string{"info", "--format", "{{.Plugins}}"})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+		Expect(session.OutputToString()).To(ContainSubstring("local"))
+		Expect(session.OutputToString()).To(ContainSubstring("journald"))
+		Expect(session.OutputToString()).To(ContainSubstring("bridge"))
+	})
+
 	It("podman info rootless storage path", func() {
 		SkipIfNotRootless("test of rootless_storage_path is only meaningful as rootless")
 		SkipIfRemote("Only tests storage on local client")