Skip to content

Commit a25ad39

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #9470 from vrothberg/3.0-bump-go-module
[3.0] bump go module to v3
2 parents 9a2fc37 + cb475b8 commit a25ad39

File tree

679 files changed

+1787
-1787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

679 files changed

+1787
-1787
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ else
5959
BUILD_INFO ?= $(shell date "+$(DATE_FMT)")
6060
ISODATE ?= $(shell date --iso-8601)
6161
endif
62-
LIBPOD := ${PROJECT}/v2/libpod
62+
LIBPOD := ${PROJECT}/v3/libpod
6363
GCFLAGS ?= all=-trimpath=${PWD}
6464
ASMFLAGS ?= all=-trimpath=${PWD}
6565
LDFLAGS_PODMAN ?= \

‎cmd/podman/auto-update.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"github.com/containers/common/pkg/auth"
77
"github.com/containers/common/pkg/completion"
8-
"github.com/containers/podman/v2/cmd/podman/registry"
9-
"github.com/containers/podman/v2/pkg/domain/entities"
10-
"github.com/containers/podman/v2/pkg/errorhandling"
8+
"github.com/containers/podman/v3/cmd/podman/registry"
9+
"github.com/containers/podman/v3/pkg/domain/entities"
10+
"github.com/containers/podman/v3/pkg/errorhandling"
1111
"github.com/pkg/errors"
1212
"github.com/spf13/cobra"
1313
)

‎cmd/podman/common/completion.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import (
77
"strings"
88

99
"github.com/containers/common/pkg/config"
10-
"github.com/containers/podman/v2/cmd/podman/registry"
11-
"github.com/containers/podman/v2/libpod"
12-
"github.com/containers/podman/v2/libpod/define"
13-
"github.com/containers/podman/v2/pkg/domain/entities"
14-
"github.com/containers/podman/v2/pkg/registries"
15-
"github.com/containers/podman/v2/pkg/rootless"
16-
systemdGen "github.com/containers/podman/v2/pkg/systemd/generate"
17-
"github.com/containers/podman/v2/pkg/util"
10+
"github.com/containers/podman/v3/cmd/podman/registry"
11+
"github.com/containers/podman/v3/libpod"
12+
"github.com/containers/podman/v3/libpod/define"
13+
"github.com/containers/podman/v3/pkg/domain/entities"
14+
"github.com/containers/podman/v3/pkg/registries"
15+
"github.com/containers/podman/v3/pkg/rootless"
16+
systemdGen "github.com/containers/podman/v3/pkg/systemd/generate"
17+
"github.com/containers/podman/v3/pkg/util"
1818
"github.com/spf13/cobra"
1919
)
2020

‎cmd/podman/common/create.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"github.com/containers/common/pkg/auth"
77
"github.com/containers/common/pkg/completion"
8-
"github.com/containers/podman/v2/cmd/podman/registry"
9-
"github.com/containers/podman/v2/libpod/define"
8+
"github.com/containers/podman/v3/cmd/podman/registry"
9+
"github.com/containers/podman/v3/libpod/define"
1010
"github.com/spf13/cobra"
1111
)
1212

‎cmd/podman/common/create_opts.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"strconv"
88
"strings"
99

10-
"github.com/containers/podman/v2/cmd/podman/registry"
11-
"github.com/containers/podman/v2/pkg/api/handlers"
12-
"github.com/containers/podman/v2/pkg/cgroups"
13-
"github.com/containers/podman/v2/pkg/domain/entities"
14-
"github.com/containers/podman/v2/pkg/rootless"
15-
"github.com/containers/podman/v2/pkg/specgen"
10+
"github.com/containers/podman/v3/cmd/podman/registry"
11+
"github.com/containers/podman/v3/pkg/api/handlers"
12+
"github.com/containers/podman/v3/pkg/cgroups"
13+
"github.com/containers/podman/v3/pkg/domain/entities"
14+
"github.com/containers/podman/v3/pkg/rootless"
15+
"github.com/containers/podman/v3/pkg/specgen"
1616
)
1717

1818
type ContainerCLIOpts struct {

‎cmd/podman/common/createparse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package common
22

33
import (
4-
"github.com/containers/podman/v2/pkg/util"
4+
"github.com/containers/podman/v3/pkg/util"
55
"github.com/pkg/errors"
66
)
77

‎cmd/podman/common/default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package common
22

33
import (
4-
"github.com/containers/podman/v2/cmd/podman/registry"
4+
"github.com/containers/podman/v3/cmd/podman/registry"
55
)
66

77
var (

‎cmd/podman/common/diffChanges.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/containers/podman/v2/pkg/domain/entities"
7+
"github.com/containers/podman/v3/pkg/domain/entities"
88
"github.com/containers/storage/pkg/archive"
99
"github.com/pkg/errors"
1010
)

‎cmd/podman/common/netflags.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"strings"
66

77
"github.com/containers/common/pkg/completion"
8-
"github.com/containers/podman/v2/cmd/podman/parse"
9-
"github.com/containers/podman/v2/libpod/define"
10-
"github.com/containers/podman/v2/pkg/domain/entities"
11-
"github.com/containers/podman/v2/pkg/specgen"
8+
"github.com/containers/podman/v3/cmd/podman/parse"
9+
"github.com/containers/podman/v3/libpod/define"
10+
"github.com/containers/podman/v3/pkg/domain/entities"
11+
"github.com/containers/podman/v3/pkg/specgen"
1212
"github.com/pkg/errors"
1313
"github.com/spf13/cobra"
1414
)

‎cmd/podman/common/specgen.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import (
88
"time"
99

1010
"github.com/containers/image/v5/manifest"
11-
"github.com/containers/podman/v2/cmd/podman/parse"
12-
"github.com/containers/podman/v2/libpod/define"
13-
ann "github.com/containers/podman/v2/pkg/annotations"
14-
envLib "github.com/containers/podman/v2/pkg/env"
15-
ns "github.com/containers/podman/v2/pkg/namespaces"
16-
"github.com/containers/podman/v2/pkg/specgen"
17-
systemdGen "github.com/containers/podman/v2/pkg/systemd/generate"
18-
"github.com/containers/podman/v2/pkg/util"
11+
"github.com/containers/podman/v3/cmd/podman/parse"
12+
"github.com/containers/podman/v3/libpod/define"
13+
ann "github.com/containers/podman/v3/pkg/annotations"
14+
envLib "github.com/containers/podman/v3/pkg/env"
15+
ns "github.com/containers/podman/v3/pkg/namespaces"
16+
"github.com/containers/podman/v3/pkg/specgen"
17+
systemdGen "github.com/containers/podman/v3/pkg/systemd/generate"
18+
"github.com/containers/podman/v3/pkg/util"
1919
"github.com/docker/go-units"
2020
"github.com/opencontainers/runtime-spec/specs-go"
2121
"github.com/pkg/errors"

‎cmd/podman/common/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strconv"
77
"strings"
88

9-
"github.com/containers/podman/v2/pkg/specgen"
9+
"github.com/containers/podman/v3/pkg/specgen"
1010
"github.com/pkg/errors"
1111
"github.com/sirupsen/logrus"
1212
)

‎cmd/podman/common/volumes.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strings"
77

88
"github.com/containers/common/pkg/parse"
9-
"github.com/containers/podman/v2/pkg/specgen"
10-
"github.com/containers/podman/v2/pkg/util"
9+
"github.com/containers/podman/v3/pkg/specgen"
10+
"github.com/containers/podman/v3/pkg/util"
1111
spec "github.com/opencontainers/runtime-spec/specs-go"
1212
"github.com/pkg/errors"
1313
)

‎cmd/podman/completion/completion.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88

99
commonComp "github.com/containers/common/pkg/completion"
10-
"github.com/containers/podman/v2/cmd/podman/registry"
11-
"github.com/containers/podman/v2/pkg/domain/entities"
10+
"github.com/containers/podman/v3/cmd/podman/registry"
11+
"github.com/containers/podman/v3/pkg/domain/entities"
1212
"github.com/spf13/cobra"
1313
)
1414

‎cmd/podman/containers/attach.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package containers
33
import (
44
"os"
55

6-
"github.com/containers/podman/v2/cmd/podman/common"
7-
"github.com/containers/podman/v2/cmd/podman/registry"
8-
"github.com/containers/podman/v2/cmd/podman/validate"
9-
"github.com/containers/podman/v2/pkg/domain/entities"
6+
"github.com/containers/podman/v3/cmd/podman/common"
7+
"github.com/containers/podman/v3/cmd/podman/registry"
8+
"github.com/containers/podman/v3/cmd/podman/validate"
9+
"github.com/containers/podman/v3/pkg/domain/entities"
1010
"github.com/pkg/errors"
1111
"github.com/spf13/cobra"
1212
)

‎cmd/podman/containers/checkpoint.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55
"fmt"
66

77
"github.com/containers/common/pkg/completion"
8-
"github.com/containers/podman/v2/cmd/podman/common"
9-
"github.com/containers/podman/v2/cmd/podman/registry"
10-
"github.com/containers/podman/v2/cmd/podman/utils"
11-
"github.com/containers/podman/v2/cmd/podman/validate"
12-
"github.com/containers/podman/v2/pkg/domain/entities"
13-
"github.com/containers/podman/v2/pkg/rootless"
8+
"github.com/containers/podman/v3/cmd/podman/common"
9+
"github.com/containers/podman/v3/cmd/podman/registry"
10+
"github.com/containers/podman/v3/cmd/podman/utils"
11+
"github.com/containers/podman/v3/cmd/podman/validate"
12+
"github.com/containers/podman/v3/pkg/domain/entities"
13+
"github.com/containers/podman/v3/pkg/rootless"
1414
"github.com/pkg/errors"
1515
"github.com/spf13/cobra"
1616
)

‎cmd/podman/containers/cleanup.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"fmt"
55

66
"github.com/containers/common/pkg/completion"
7-
"github.com/containers/podman/v2/cmd/podman/common"
8-
"github.com/containers/podman/v2/cmd/podman/registry"
9-
"github.com/containers/podman/v2/cmd/podman/utils"
10-
"github.com/containers/podman/v2/cmd/podman/validate"
11-
"github.com/containers/podman/v2/pkg/domain/entities"
7+
"github.com/containers/podman/v3/cmd/podman/common"
8+
"github.com/containers/podman/v3/cmd/podman/registry"
9+
"github.com/containers/podman/v3/cmd/podman/utils"
10+
"github.com/containers/podman/v3/cmd/podman/validate"
11+
"github.com/containers/podman/v3/pkg/domain/entities"
1212
"github.com/pkg/errors"
1313
"github.com/sirupsen/logrus"
1414
"github.com/spf13/cobra"

‎cmd/podman/containers/commit.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"strings"
99

1010
"github.com/containers/common/pkg/completion"
11-
"github.com/containers/podman/v2/cmd/podman/common"
12-
"github.com/containers/podman/v2/cmd/podman/registry"
13-
"github.com/containers/podman/v2/pkg/domain/entities"
11+
"github.com/containers/podman/v3/cmd/podman/common"
12+
"github.com/containers/podman/v3/cmd/podman/registry"
13+
"github.com/containers/podman/v3/pkg/domain/entities"
1414
"github.com/pkg/errors"
1515
"github.com/spf13/cobra"
1616
)

‎cmd/podman/containers/container.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package containers
22

33
import (
4-
"github.com/containers/podman/v2/cmd/podman/registry"
5-
"github.com/containers/podman/v2/cmd/podman/validate"
6-
"github.com/containers/podman/v2/pkg/domain/entities"
7-
"github.com/containers/podman/v2/pkg/util"
4+
"github.com/containers/podman/v3/cmd/podman/registry"
5+
"github.com/containers/podman/v3/cmd/podman/validate"
6+
"github.com/containers/podman/v3/pkg/domain/entities"
7+
"github.com/containers/podman/v3/pkg/util"
88
"github.com/spf13/cobra"
99
)
1010

‎cmd/podman/containers/cp.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"strings"
1111

1212
buildahCopiah "github.com/containers/buildah/copier"
13-
"github.com/containers/podman/v2/cmd/podman/common"
14-
"github.com/containers/podman/v2/cmd/podman/registry"
15-
"github.com/containers/podman/v2/pkg/copy"
16-
"github.com/containers/podman/v2/pkg/domain/entities"
17-
"github.com/containers/podman/v2/pkg/errorhandling"
13+
"github.com/containers/podman/v3/cmd/podman/common"
14+
"github.com/containers/podman/v3/cmd/podman/registry"
15+
"github.com/containers/podman/v3/pkg/copy"
16+
"github.com/containers/podman/v3/pkg/domain/entities"
17+
"github.com/containers/podman/v3/pkg/errorhandling"
1818
"github.com/containers/storage/pkg/archive"
1919
"github.com/containers/storage/pkg/idtools"
2020
"github.com/pkg/errors"

‎cmd/podman/containers/create.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"github.com/containers/common/pkg/config"
1111
"github.com/containers/image/v5/storage"
1212
"github.com/containers/image/v5/transports/alltransports"
13-
"github.com/containers/podman/v2/cmd/podman/common"
14-
"github.com/containers/podman/v2/cmd/podman/registry"
15-
"github.com/containers/podman/v2/cmd/podman/utils"
16-
"github.com/containers/podman/v2/libpod/define"
17-
"github.com/containers/podman/v2/pkg/domain/entities"
18-
"github.com/containers/podman/v2/pkg/specgen"
19-
"github.com/containers/podman/v2/pkg/util"
13+
"github.com/containers/podman/v3/cmd/podman/common"
14+
"github.com/containers/podman/v3/cmd/podman/registry"
15+
"github.com/containers/podman/v3/cmd/podman/utils"
16+
"github.com/containers/podman/v3/libpod/define"
17+
"github.com/containers/podman/v3/pkg/domain/entities"
18+
"github.com/containers/podman/v3/pkg/specgen"
19+
"github.com/containers/podman/v3/pkg/util"
2020
"github.com/pkg/errors"
2121
"github.com/sirupsen/logrus"
2222
"github.com/spf13/cobra"

‎cmd/podman/containers/diff.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package containers
22

33
import (
44
"github.com/containers/common/pkg/report"
5-
"github.com/containers/podman/v2/cmd/podman/common"
6-
"github.com/containers/podman/v2/cmd/podman/registry"
7-
"github.com/containers/podman/v2/cmd/podman/validate"
8-
"github.com/containers/podman/v2/pkg/domain/entities"
5+
"github.com/containers/podman/v3/cmd/podman/common"
6+
"github.com/containers/podman/v3/cmd/podman/registry"
7+
"github.com/containers/podman/v3/cmd/podman/validate"
8+
"github.com/containers/podman/v3/pkg/domain/entities"
99
"github.com/pkg/errors"
1010
"github.com/spf13/cobra"
1111
)

‎cmd/podman/containers/exec.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66
"os"
77

88
"github.com/containers/common/pkg/completion"
9-
"github.com/containers/podman/v2/cmd/podman/common"
10-
"github.com/containers/podman/v2/cmd/podman/registry"
11-
"github.com/containers/podman/v2/cmd/podman/validate"
12-
"github.com/containers/podman/v2/libpod/define"
13-
"github.com/containers/podman/v2/pkg/domain/entities"
14-
envLib "github.com/containers/podman/v2/pkg/env"
15-
"github.com/containers/podman/v2/pkg/rootless"
9+
"github.com/containers/podman/v3/cmd/podman/common"
10+
"github.com/containers/podman/v3/cmd/podman/registry"
11+
"github.com/containers/podman/v3/cmd/podman/validate"
12+
"github.com/containers/podman/v3/libpod/define"
13+
"github.com/containers/podman/v3/pkg/domain/entities"
14+
envLib "github.com/containers/podman/v3/pkg/env"
15+
"github.com/containers/podman/v3/pkg/rootless"
1616
"github.com/pkg/errors"
1717
"github.com/spf13/cobra"
1818
)

‎cmd/podman/containers/exists.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package containers
33
import (
44
"context"
55

6-
"github.com/containers/podman/v2/cmd/podman/common"
7-
"github.com/containers/podman/v2/cmd/podman/registry"
8-
"github.com/containers/podman/v2/pkg/domain/entities"
6+
"github.com/containers/podman/v3/cmd/podman/common"
7+
"github.com/containers/podman/v3/cmd/podman/registry"
8+
"github.com/containers/podman/v3/pkg/domain/entities"
99
"github.com/spf13/cobra"
1010
)
1111

‎cmd/podman/containers/export.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"os"
66

77
"github.com/containers/common/pkg/completion"
8-
"github.com/containers/podman/v2/cmd/podman/common"
9-
"github.com/containers/podman/v2/cmd/podman/parse"
10-
"github.com/containers/podman/v2/cmd/podman/registry"
11-
"github.com/containers/podman/v2/pkg/domain/entities"
8+
"github.com/containers/podman/v3/cmd/podman/common"
9+
"github.com/containers/podman/v3/cmd/podman/parse"
10+
"github.com/containers/podman/v3/cmd/podman/registry"
11+
"github.com/containers/podman/v3/pkg/domain/entities"
1212
"github.com/pkg/errors"
1313
"github.com/spf13/cobra"
1414
"golang.org/x/crypto/ssh/terminal"

‎cmd/podman/containers/init.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package containers
33
import (
44
"fmt"
55

6-
"github.com/containers/podman/v2/cmd/podman/common"
7-
"github.com/containers/podman/v2/cmd/podman/registry"
8-
"github.com/containers/podman/v2/cmd/podman/utils"
9-
"github.com/containers/podman/v2/cmd/podman/validate"
10-
"github.com/containers/podman/v2/pkg/domain/entities"
6+
"github.com/containers/podman/v3/cmd/podman/common"
7+
"github.com/containers/podman/v3/cmd/podman/registry"
8+
"github.com/containers/podman/v3/cmd/podman/utils"
9+
"github.com/containers/podman/v3/cmd/podman/validate"
10+
"github.com/containers/podman/v3/pkg/domain/entities"
1111
"github.com/spf13/cobra"
1212
"github.com/spf13/pflag"
1313
)

‎cmd/podman/containers/inspect.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package containers
22

33
import (
4-
"github.com/containers/podman/v2/cmd/podman/common"
5-
"github.com/containers/podman/v2/cmd/podman/inspect"
6-
"github.com/containers/podman/v2/cmd/podman/registry"
7-
"github.com/containers/podman/v2/cmd/podman/validate"
8-
"github.com/containers/podman/v2/pkg/domain/entities"
4+
"github.com/containers/podman/v3/cmd/podman/common"
5+
"github.com/containers/podman/v3/cmd/podman/inspect"
6+
"github.com/containers/podman/v3/cmd/podman/registry"
7+
"github.com/containers/podman/v3/cmd/podman/validate"
8+
"github.com/containers/podman/v3/pkg/domain/entities"
99
"github.com/spf13/cobra"
1010
)
1111

0 commit comments

Comments
 (0)