diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-22 05:51:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 05:51:31 -0500 |
| commit | d92b94677cc816a1e157802836195430b731d015 (patch) | |
| tree | 0d5263d46e409f3c3bf204c3fffc6372ba608840 /libpod/network | |
| parent | 37438f7e8dc214a99f542f0be86d349f6379c29b (diff) | |
| parent | 5dded6fae7aebd7313cf90a60c388f417a1e64e2 (diff) | |
| download | podman-d92b94677cc816a1e157802836195430b731d015.tar.gz podman-d92b94677cc816a1e157802836195430b731d015.tar.bz2 podman-d92b94677cc816a1e157802836195430b731d015.zip | |
Merge pull request #9448 from vrothberg/bump-module-version
bump go module to v3
Diffstat (limited to 'libpod/network')
| -rw-r--r-- | libpod/network/create.go | 6 | ||||
| -rw-r--r-- | libpod/network/create_test.go | 2 | ||||
| -rw-r--r-- | libpod/network/devices.go | 4 | ||||
| -rw-r--r-- | libpod/network/files.go | 2 | ||||
| -rw-r--r-- | libpod/network/netconflist.go | 2 | ||||
| -rw-r--r-- | libpod/network/network.go | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/libpod/network/create.go b/libpod/network/create.go index c58d62575..1a5aa82fc 100644 --- a/libpod/network/create.go +++ b/libpod/network/create.go @@ -10,9 +10,9 @@ import ( "github.com/containernetworking/cni/pkg/version" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/network/create_test.go b/libpod/network/create_test.go index 017bf31fe..c3824bd91 100644 --- a/libpod/network/create_test.go +++ b/libpod/network/create_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/entities" ) func Test_validateBridgeOptions(t *testing.T) { diff --git a/libpod/network/devices.go b/libpod/network/devices.go index a5d23fae4..de6bb4efc 100644 --- a/libpod/network/devices.go +++ b/libpod/network/devices.go @@ -5,8 +5,8 @@ import ( "os/exec" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/pkg/util" - "github.com/containers/podman/v2/utils" + "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v3/utils" "github.com/sirupsen/logrus" ) diff --git a/libpod/network/files.go b/libpod/network/files.go index 33cf01064..f869d32c3 100644 --- a/libpod/network/files.go +++ b/libpod/network/files.go @@ -10,7 +10,7 @@ import ( "github.com/containernetworking/cni/libcni" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v3/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/network/netconflist.go b/libpod/network/netconflist.go index 9be98e78f..1a1583587 100644 --- a/libpod/network/netconflist.go +++ b/libpod/network/netconflist.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/containernetworking/cni/libcni" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" ) diff --git a/libpod/network/network.go b/libpod/network/network.go index cdaef6c13..b347ec0e2 100644 --- a/libpod/network/network.go +++ b/libpod/network/network.go @@ -10,10 +10,10 @@ import ( "github.com/containernetworking/cni/pkg/types" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) |