move go module to v2

With the advent of Podman 2.0.0 we crossed the magical barrier of go
modules. While we were able to continue importing all packages inside
of the project, the project could not be vendored anymore from the
outside.

Move the go module to new major version and change all imports to
github.com/containers/libpod/v2. The renaming of the imports
was done via gomove [1].

[1] https://github.com/KSubedi/gomove

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

19 files changed, 66 insertions, 66 deletions

diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go
index db977ee5c..731d89b8f 100644
--- a/pkg/varlinkapi/attach.go
+++ b/pkg/varlinkapi/attach.go
@@ -6,11 +6,11 @@ import (
 	"bufio"
 	"io"
 
-	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/libpod/define"
-	"github.com/containers/libpod/libpod/events"
-	iopodman "github.com/containers/libpod/pkg/varlink"
-	"github.com/containers/libpod/pkg/varlinkapi/virtwriter"
+	"github.com/containers/libpod/v2/libpod"
+	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/libpod/v2/libpod/events"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
+	"github.com/containers/libpod/v2/pkg/varlinkapi/virtwriter"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"k8s.io/client-go/tools/remotecommand"
diff --git a/pkg/varlinkapi/config.go b/pkg/varlinkapi/config.go
index cc787eca2..cd6342a17 100644
--- a/pkg/varlinkapi/config.go
+++ b/pkg/varlinkapi/config.go
@@ -3,8 +3,8 @@
 package varlinkapi
 
 import (
-	"github.com/containers/libpod/libpod"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/libpod"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/varlinkapi/container.go b/pkg/varlinkapi/container.go
index eae54dfeb..d578d9b87 100644
--- a/pkg/varlinkapi/container.go
+++ b/pkg/varlinkapi/container.go
@@ -15,11 +15,11 @@ import (
 	"time"
 
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/libpod/define"
-	"github.com/containers/libpod/libpod/image"
-	"github.com/containers/libpod/pkg/timetype"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/libpod"
+	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/libpod/v2/libpod/image"
+	"github.com/containers/libpod/v2/pkg/timetype"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/go-units"
 	"github.com/google/shlex"
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index a81d19131..8650ba000 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -14,13 +14,13 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/libpod/define"
-	"github.com/containers/libpod/libpod/logs"
-	"github.com/containers/libpod/pkg/cgroups"
-	"github.com/containers/libpod/pkg/rootless"
-	iopodman "github.com/containers/libpod/pkg/varlink"
-	"github.com/containers/libpod/pkg/varlinkapi/virtwriter"
+	"github.com/containers/libpod/v2/libpod"
+	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/libpod/v2/libpod/logs"
+	"github.com/containers/libpod/v2/pkg/cgroups"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
+	"github.com/containers/libpod/v2/pkg/varlinkapi/virtwriter"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go
index f0a87491a..2fdcfedca 100644
--- a/pkg/varlinkapi/containers_create.go
+++ b/pkg/varlinkapi/containers_create.go
@@ -3,7 +3,7 @@
 package varlinkapi
 
 import (
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 )
 
 // CreateContainer ...
diff --git a/pkg/varlinkapi/create.go b/pkg/varlinkapi/create.go
index d921130e7..5c5f075f7 100644
--- a/pkg/varlinkapi/create.go
+++ b/pkg/varlinkapi/create.go
@@ -15,22 +15,22 @@ import (
 
 	"github.com/containers/common/pkg/sysinfo"
 	"github.com/containers/image/v5/manifest"
-	"github.com/containers/libpod/cmd/podman/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"
-	"github.com/containers/libpod/pkg/cgroups"
-	envLib "github.com/containers/libpod/pkg/env"
-	"github.com/containers/libpod/pkg/errorhandling"
-	"github.com/containers/libpod/pkg/inspect"
-	ns "github.com/containers/libpod/pkg/namespaces"
-	"github.com/containers/libpod/pkg/rootless"
-	"github.com/containers/libpod/pkg/seccomp"
-	cc "github.com/containers/libpod/pkg/spec"
-	systemdGen "github.com/containers/libpod/pkg/systemd/generate"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
+	"github.com/containers/libpod/v2/libpod"
+	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/libpod/v2/libpod/image"
+	ann "github.com/containers/libpod/v2/pkg/annotations"
+	"github.com/containers/libpod/v2/pkg/autoupdate"
+	"github.com/containers/libpod/v2/pkg/cgroups"
+	envLib "github.com/containers/libpod/v2/pkg/env"
+	"github.com/containers/libpod/v2/pkg/errorhandling"
+	"github.com/containers/libpod/v2/pkg/inspect"
+	ns "github.com/containers/libpod/v2/pkg/namespaces"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/seccomp"
+	cc "github.com/containers/libpod/v2/pkg/spec"
+	systemdGen "github.com/containers/libpod/v2/pkg/systemd/generate"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
 	"github.com/opentracing/opentracing-go"
diff --git a/pkg/varlinkapi/events.go b/pkg/varlinkapi/events.go
index 33938f08b..2e468b706 100644
--- a/pkg/varlinkapi/events.go
+++ b/pkg/varlinkapi/events.go
@@ -5,8 +5,8 @@ package varlinkapi
 import (
 	"time"
 
-	"github.com/containers/libpod/libpod/events"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/libpod/events"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 )
 
 // GetEvents is a remote endpoint to get events from the event log
diff --git a/pkg/varlinkapi/funcs.go b/pkg/varlinkapi/funcs.go
index ed90ba050..e32e311b0 100644
--- a/pkg/varlinkapi/funcs.go
+++ b/pkg/varlinkapi/funcs.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/v2/libpod/image"
 	"github.com/google/shlex"
 	"github.com/pkg/errors"
 )
diff --git a/pkg/varlinkapi/generate.go b/pkg/varlinkapi/generate.go
index 4df185db6..7c481aad7 100644
--- a/pkg/varlinkapi/generate.go
+++ b/pkg/varlinkapi/generate.go
@@ -5,7 +5,7 @@ package varlinkapi
 import (
 	"encoding/json"
 
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 )
 
 // GenerateKube ...
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
index 8d43b8414..8d67a47bc 100644
--- a/pkg/varlinkapi/images.go
+++ b/pkg/varlinkapi/images.go
@@ -20,13 +20,13 @@ import (
 	"github.com/containers/image/v5/manifest"
 	"github.com/containers/image/v5/transports/alltransports"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/libpod/define"
-	"github.com/containers/libpod/libpod/image"
-	"github.com/containers/libpod/pkg/channelwriter"
-	"github.com/containers/libpod/pkg/util"
-	iopodman "github.com/containers/libpod/pkg/varlink"
-	"github.com/containers/libpod/utils"
+	"github.com/containers/libpod/v2/libpod"
+	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/libpod/v2/libpod/image"
+	"github.com/containers/libpod/v2/pkg/channelwriter"
+	"github.com/containers/libpod/v2/pkg/util"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
+	"github.com/containers/libpod/v2/utils"
 	"github.com/containers/storage/pkg/archive"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
diff --git a/pkg/varlinkapi/intermediate_varlink.go b/pkg/varlinkapi/intermediate_varlink.go
index bd0c45b33..f1a183017 100644
--- a/pkg/varlinkapi/intermediate_varlink.go
+++ b/pkg/varlinkapi/intermediate_varlink.go
@@ -4,8 +4,8 @@ package varlinkapi
 
 import (
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/pkg/rootless"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/varlinkapi/mount.go b/pkg/varlinkapi/mount.go
index 6e1eed644..a04a0b630 100644
--- a/pkg/varlinkapi/mount.go
+++ b/pkg/varlinkapi/mount.go
@@ -2,7 +2,7 @@
 
 package varlinkapi
 
-import iopodman "github.com/containers/libpod/pkg/varlink"
+import iopodman "github.com/containers/libpod/v2/pkg/varlink"
 
 // ListContainerMounts ...
 func (i *VarlinkAPI) ListContainerMounts(call iopodman.VarlinkCall) error {
diff --git a/pkg/varlinkapi/pods.go b/pkg/varlinkapi/pods.go
index aeb3cdcb8..b190233d5 100644
--- a/pkg/varlinkapi/pods.go
+++ b/pkg/varlinkapi/pods.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/libpod/define"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/libpod"
+	"github.com/containers/libpod/v2/libpod/define"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/go-connections/nat"
 	"github.com/pkg/errors"
diff --git a/pkg/varlinkapi/remote_client.go b/pkg/varlinkapi/remote_client.go
index 88e410de6..0ad2d89cc 100644
--- a/pkg/varlinkapi/remote_client.go
+++ b/pkg/varlinkapi/remote_client.go
@@ -3,8 +3,8 @@
 package varlinkapi
 
 import (
-	"github.com/containers/libpod/libpod/define"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/libpod/define"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 )
 
 // ContainerStatsToLibpodContainerStats converts the varlink containerstats to a libpod
diff --git a/pkg/varlinkapi/shortcuts.go b/pkg/varlinkapi/shortcuts.go
index 771129404..8e21cc5d0 100644
--- a/pkg/varlinkapi/shortcuts.go
+++ b/pkg/varlinkapi/shortcuts.go
@@ -1,7 +1,7 @@
 package varlinkapi
 
 import (
-	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/v2/libpod"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go
index 308f02274..b5fe681fd 100644
--- a/pkg/varlinkapi/system.go
+++ b/pkg/varlinkapi/system.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/containers/image/v5/pkg/sysregistriesv2"
-	"github.com/containers/libpod/libpod/define"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/libpod/define"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/varlinkapi/transfers.go b/pkg/varlinkapi/transfers.go
index aed6e054d..32c227d56 100644
--- a/pkg/varlinkapi/transfers.go
+++ b/pkg/varlinkapi/transfers.go
@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go
index f73e77249..64b61c6fd 100644
--- a/pkg/varlinkapi/util.go
+++ b/pkg/varlinkapi/util.go
@@ -9,10 +9,10 @@ import (
 	"time"
 
 	"github.com/containers/buildah"
-	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/libpod/define"
-	"github.com/containers/libpod/pkg/channelwriter"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/libpod"
+	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/libpod/v2/pkg/channelwriter"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 	"github.com/containers/storage/pkg/archive"
 )
 
diff --git a/pkg/varlinkapi/volumes.go b/pkg/varlinkapi/volumes.go
index 3b6276287..a1e711d34 100644
--- a/pkg/varlinkapi/volumes.go
+++ b/pkg/varlinkapi/volumes.go
@@ -6,9 +6,9 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/pkg/domain/infra/abi/parse"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/libpod"
+	"github.com/containers/libpod/v2/pkg/domain/infra/abi/parse"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 )
 
 // VolumeCreate creates a libpod volume based on input from a varlink connection