podman v2 remove bloat v2

rid ourseleves of libpod references in v2 client

Signed-off-by: Brent Baude <[email protected]>

cmd/podman/shared/create.go

@@ -16,6 +16,7 @@ import (
 	"github.com/containers/image/v5/manifest"
 	"github.com/containers/libpod/cmd/podman/shared/parse"
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/image"
 	ann "github.com/containers/libpod/pkg/annotations"
 	"github.com/containers/libpod/pkg/autoupdate"
@@ -715,7 +716,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
 	// both
 	memorySwappiness := c.Int64("memory-swappiness")
 
-	logDriver := libpod.KubernetesLogging
+	logDriver := define.KubernetesLogging
 	if c.Changed("log-driver") {
 		logDriver = c.String("log-driver")
 	}

cmd/podmanV2/common/specgen.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/containers/image/v5/manifest"
 	"github.com/containers/libpod/cmd/podmanV2/parse"
-	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/define"
 	ann "github.com/containers/libpod/pkg/annotations"
 	envLib "github.com/containers/libpod/pkg/env"
 	ns "github.com/containers/libpod/pkg/namespaces"
@@ -324,7 +324,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
 	if s.LogConfiguration == nil {
 		s.LogConfiguration = &specgen.LogConfig{}
 	}
-	s.LogConfiguration.Driver = libpod.KubernetesLogging
+	s.LogConfiguration.Driver = define.KubernetesLogging
 	if ld := c.LogDriver; len(ld) > 0 {
 		s.LogConfiguration.Driver = ld
 	}

cmd/podmanV2/registry/config.go

@@ -1,13 +1,17 @@
 package registry
 
 import (
+	"fmt"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/pkg/util"
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
@@ -21,7 +25,7 @@ var (
 
 // NewPodmanConfig creates a PodmanConfig from the environment
 func NewPodmanConfig() entities.PodmanConfig {
-	if err := libpod.SetXdgDirs(); err != nil {
+	if err := setXdgDirs(); err != nil {
 		logrus.Errorf(err.Error())
 		os.Exit(1)
 	}
@@ -57,3 +61,45 @@ func NewPodmanConfig() entities.PodmanConfig {
 	}
 	return entities.PodmanConfig{Config: cfg, EngineMode: mode}
 }
+
+// SetXdgDirs ensures the XDG_RUNTIME_DIR env and XDG_CONFIG_HOME variables are set.
+// containers/image uses XDG_RUNTIME_DIR to locate the auth file, XDG_CONFIG_HOME is
+// use for the libpod.conf configuration file.
+func setXdgDirs() error {
+	if !rootless.IsRootless() {
+		return nil
+	}
+
+	// Setup XDG_RUNTIME_DIR
+	runtimeDir := os.Getenv("XDG_RUNTIME_DIR")
+
+	if runtimeDir == "" {
+		var err error
+		runtimeDir, err = util.GetRuntimeDir()
+		if err != nil {
+			return err
+		}
+	}
+	if err := os.Setenv("XDG_RUNTIME_DIR", runtimeDir); err != nil {
+		return errors.Wrapf(err, "cannot set XDG_RUNTIME_DIR")
+	}
+
+	if rootless.IsRootless() && os.Getenv("DBUS_SESSION_BUS_ADDRESS") == "" {
+		sessionAddr := filepath.Join(runtimeDir, "bus")
+		if _, err := os.Stat(sessionAddr); err == nil {
+			os.Setenv("DBUS_SESSION_BUS_ADDRESS", fmt.Sprintf("unix:path=%s", sessionAddr))
+		}
+	}
+
+	// Setup XDG_CONFIG_HOME
+	if cfgHomeDir := os.Getenv("XDG_CONFIG_HOME"); cfgHomeDir == "" {
+		cfgHomeDir, err := util.GetRootlessConfigHomeDir()
+		if err != nil {
+			return err
+		}
+		if err := os.Setenv("XDG_CONFIG_HOME", cfgHomeDir); err != nil {
+			return errors.Wrapf(err, "cannot set XDG_CONFIG_HOME")
+		}
+	}
+	return nil
+}

libpod/container.go

@@ -34,15 +34,6 @@ const SystemdDefaultCgroupParent = "machine.slice"
 // manager in libpod when running as rootless
 const SystemdDefaultRootlessCgroupParent = "user.slice"
 
-// JournaldLogging is the string conmon expects to specify journald logging
-const JournaldLogging = "journald"
-
-// KubernetesLogging is the string conmon expects when specifying to use the kubernetes logging format
-const KubernetesLogging = "k8s-file"
-
-// JSONLogging is the string conmon expects when specifying to use the json logging format
-const JSONLogging = "json-file"
-
 // DefaultWaitInterval is the default interval between container status checks
 // while waiting.
 const DefaultWaitInterval = 250 * time.Millisecond

libpod/container.log.go → libpod/container_log.go

@@ -3,6 +3,7 @@ package libpod
 import (
 	"os"
 
+	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/logs"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -22,7 +23,7 @@ func (r *Runtime) Log(containers []*Container, options *logs.LogOptions, logChan
 func (c *Container) ReadLog(options *logs.LogOptions, logChannel chan *logs.LogLine) error {
 	// TODO Skip sending logs until journald logs can be read
 	// TODO make this not a magic string
-	if c.LogDriver() == JournaldLogging {
+	if c.LogDriver() == define.JournaldLogging {
 		return c.readFromJournal(options, logChannel)
 	}
 	return c.readFromLogFile(options, logChannel)

libpod/define/config.go

@@ -57,3 +57,12 @@ type AttachStreams struct {
 	// If false, stdout will not be attached
 	AttachInput bool
 }
+
+// JournaldLogging is the string conmon expects to specify journald logging
+const JournaldLogging = "journald"
+
+// KubernetesLogging is the string conmon expects when specifying to use the kubernetes logging format
+const KubernetesLogging = "k8s-file"
+
+// JSONLogging is the string conmon expects when specifying to use the json logging format
+const JSONLogging = "json-file"

libpod/oci_conmon_linux.go

@@ -1427,9 +1427,9 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p
 
 	var logDriver string
 	switch ctr.LogDriver() {
-	case JournaldLogging:
-		logDriver = JournaldLogging
-	case JSONLogging:
+	case define.JournaldLogging:
+		logDriver = define.JournaldLogging
+	case define.JSONLogging:
 		fallthrough
 	default: //nolint-stylecheck
 		// No case here should happen except JSONLogging, but keep this here in case the options are extended
@@ -1439,8 +1439,8 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p
 		// to get here, either a user would specify `--log-driver ""`, or this came from another place in libpod
 		// since the former case is obscure, and the latter case isn't an error, let's silently fallthrough
 		fallthrough
-	case KubernetesLogging:
-		logDriver = fmt.Sprintf("%s:%s", KubernetesLogging, logPath)
+	case define.KubernetesLogging:
+		logDriver = fmt.Sprintf("%s:%s", define.KubernetesLogging, logPath)
 	}
 
 	args = append(args, "-l", logDriver)

libpod/options.go

@@ -985,7 +985,7 @@ func WithLogDriver(driver string) CtrCreateOption {
 		switch driver {
 		case "":
 			return errors.Wrapf(define.ErrInvalidArg, "log driver must be set")
-		case JournaldLogging, KubernetesLogging, JSONLogging:
+		case define.JournaldLogging, define.KubernetesLogging, define.JSONLogging:
 			break
 		default:
 			return errors.Wrapf(define.ErrInvalidArg, "invalid log driver")

libpod/pod_api.go

@@ -431,9 +431,9 @@ func containerStatusFromContainers(allCtrs []*Container) (map[string]define.Cont
 }
 
 // Inspect returns a PodInspect struct to describe the pod
-func (p *Pod) Inspect() (*PodInspect, error) {
+func (p *Pod) Inspect() (*define.InspectPodData, error) {
 	var (
-		podContainers []PodContainerInfo
+		ctrs []define.InspectPodContainerInfo
 	)
 
 	p.lock.Lock()
@@ -443,14 +443,6 @@ func (p *Pod) Inspect() (*PodInspect, error) {
 	}
 
 	containers, err := p.runtime.state.PodContainers(p)
-	if err != nil {
-		return &PodInspect{}, err
-	}
-	ctrStatuses, err := containerStatusFromContainers(containers)
-	if err != nil {
-		return nil, err
-	}
-	status, err := CreatePodStatusResults(ctrStatuses)
 	if err != nil {
 		return nil, err
 	}
@@ -462,26 +454,29 @@ func (p *Pod) Inspect() (*PodInspect, error) {
 		if err == nil {
 			containerStatus = containerState.String()
 		}
-		pc := PodContainerInfo{
+		ctrs = append(ctrs, define.InspectPodContainerInfo{
 			ID:    c.ID(),
+			Name:  c.Name(),
 			State: containerStatus,
-		}
-		podContainers = append(podContainers, pc)
+		})
+	}
+	inspectData := define.InspectPodData{
+		ID:               p.ID(),
+		Name:             p.Name(),
+		Namespace:        p.Namespace(),
+		Created:          p.CreatedTime(),
+		Hostname:         "",
+		Labels:           p.Labels(),
+		CreateCgroup:     false,
+		CgroupParent:     p.CgroupParent(),
+		CgroupPath:       p.state.CgroupPath,
+		CreateInfra:      false,
+		InfraContainerID: p.state.InfraContainerID,
+		InfraConfig:      nil,
+		SharedNamespaces: nil,
+		NumContainers:    uint(len(containers)),
+		Containers:       ctrs,
 	}
-	infraContainerID := p.state.InfraContainerID
 
-	config := new(PodConfig)
-	if err := JSONDeepCopy(p.config, config); err != nil {
-		return nil, err
-	}
-	inspectData := PodInspect{
-		Config: config,
-		State: &PodInspectState{
-			CgroupPath:       p.state.CgroupPath,
-			InfraContainerID: infraContainerID,
-			Status:           status,
-		},
-		Containers: podContainers,
-	}
 	return &inspectData, nil
 }

libpod/runtime_ctr.go

@@ -321,7 +321,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
 		ctrNamedVolumes = append(ctrNamedVolumes, newVol)
 	}
 
-	if ctr.config.LogPath == "" && ctr.config.LogDriver != JournaldLogging {
+	if ctr.config.LogPath == "" && ctr.config.LogDriver != define.JournaldLogging {
 		ctr.config.LogPath = filepath.Join(ctr.config.StaticDir, "ctr.log")
 	}