switch to newer packages for docker

Signed-off-by: Davanum Srinivas <[email protected]>

Author: dims

container/containerd/client.go

@@ -78,6 +78,7 @@ func Client(address, namespace string) (ContainerdClient, error) {
 		}
 		connParams.Backoff.BaseDelay = baseBackoffDelay
 		connParams.Backoff.MaxDelay = maxBackoffDelay
+		//nolint:staticcheck // SA1019
 		gopts := []grpc.DialOption{
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 			grpc.WithContextDialer(dialer.ContextDialer),
@@ -93,6 +94,7 @@ func Client(address, namespace string) (ContainerdClient, error) {
 
 		ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout)
 		defer cancel()
+		//nolint:staticcheck // SA1019
 		conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)
 		if err != nil {
 			retErr = err

container/docker/docker.go

@@ -21,7 +21,8 @@ import (
 	"strconv"
 	"time"
 
-	dockertypes "github.com/docker/docker/api/types"
+	dockerimage "github.com/docker/docker/api/types/image"
+	dockersystem "github.com/docker/docker/api/types/system"
 	"golang.org/x/net/context"
 
 	"github.com/google/cadvisor/container/docker/utils"
@@ -56,7 +57,7 @@ func StatusWithContext(ctx context.Context) (v1.DockerStatus, error) {
 	return StatusFromDockerInfo(dockerInfo)
 }
 
-func StatusFromDockerInfo(dockerInfo dockertypes.Info) (v1.DockerStatus, error) {
+func StatusFromDockerInfo(dockerInfo dockersystem.Info) (v1.DockerStatus, error) {
 	out := v1.DockerStatus{}
 	out.KernelVersion = machine.KernelVersion()
 	out.OS = dockerInfo.OperatingSystem
@@ -88,7 +89,7 @@ func Images() ([]v1.DockerImage, error) {
 	if err != nil {
 		return nil, fmt.Errorf("unable to communicate with docker daemon: %v", err)
 	}
-	summaries, err := client.ImageList(defaultContext(), dockertypes.ImageListOptions{All: false})
+	summaries, err := client.ImageList(defaultContext(), dockerimage.ListOptions{All: false})
 	if err != nil {
 		return nil, err
 	}
@@ -97,7 +98,7 @@ func Images() ([]v1.DockerImage, error) {
 
 // Checks whether the dockerInfo reflects a valid docker setup, and returns it if it does, or an
 // error otherwise.
-func ValidateInfo(GetInfo func() (*dockertypes.Info, error), ServerVersion func() (string, error)) (*dockertypes.Info, error) {
+func ValidateInfo(GetInfo func() (*dockersystem.Info, error), ServerVersion func() (string, error)) (*dockersystem.Info, error) {
 	info, err := GetInfo()
 	if err != nil {
 		return nil, err
@@ -128,7 +129,7 @@ func ValidateInfo(GetInfo func() (*dockertypes.Info, error), ServerVersion func(
 	return info, nil
 }
 
-func Info() (*dockertypes.Info, error) {
+func Info() (*dockersystem.Info, error) {
 	client, err := Client()
 	if err != nil {
 		return nil, fmt.Errorf("unable to communicate with docker daemon: %v", err)

container/docker/factory.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/blang/semver/v4"
-	dockertypes "github.com/docker/docker/api/types"
+	dockersystem "github.com/docker/docker/api/types/system"
 
 	"github.com/google/cadvisor/container"
 	dockerutil "github.com/google/cadvisor/container/docker/utils"
@@ -194,7 +194,7 @@ var (
 	apiVersionRe           = regexp.MustCompile(apiVersionRegexpString)
 )
 
-func StartThinPoolWatcher(dockerInfo *dockertypes.Info) (*devicemapper.ThinPoolWatcher, error) {
+func StartThinPoolWatcher(dockerInfo *dockersystem.Info) (*devicemapper.ThinPoolWatcher, error) {
 	_, err := devicemapper.ThinLsBinaryPresent()
 	if err != nil {
 		return nil, err
@@ -227,7 +227,7 @@ func StartThinPoolWatcher(dockerInfo *dockertypes.Info) (*devicemapper.ThinPoolW
 	return thinPoolWatcher, nil
 }
 
-func StartZfsWatcher(dockerInfo *dockertypes.Info) (*zfs.ZfsWatcher, error) {
+func StartZfsWatcher(dockerInfo *dockersystem.Info) (*zfs.ZfsWatcher, error) {
 	filesystem, err := dockerutil.DockerZfsFilesystem(*dockerInfo)
 	if err != nil {
 		return nil, err

container/docker/utils/docker.go

@@ -21,7 +21,8 @@ import (
 	"regexp"
 	"strings"
 
-	dockertypes "github.com/docker/docker/api/types"
+	dockerimage "github.com/docker/docker/api/types/image"
+	dockersystem "github.com/docker/docker/api/types/system"
 	v1 "github.com/google/cadvisor/info/v1"
 )
 
@@ -45,7 +46,7 @@ func DriverStatusValue(status [][2]string, target string) string {
 	return ""
 }
 
-func DockerThinPoolName(info dockertypes.Info) (string, error) {
+func DockerThinPoolName(info dockersystem.Info) (string, error) {
 	poolName := DriverStatusValue(info.DriverStatus, DriverStatusPoolName)
 	if len(poolName) == 0 {
 		return "", fmt.Errorf("Could not get devicemapper pool name")
@@ -54,7 +55,7 @@ func DockerThinPoolName(info dockertypes.Info) (string, error) {
 	return poolName, nil
 }
 
-func DockerMetadataDevice(info dockertypes.Info) (string, error) {
+func DockerMetadataDevice(info dockersystem.Info) (string, error) {
 	metadataDevice := DriverStatusValue(info.DriverStatus, DriverStatusMetadataFile)
 	if len(metadataDevice) != 0 {
 		return metadataDevice, nil
@@ -74,7 +75,7 @@ func DockerMetadataDevice(info dockertypes.Info) (string, error) {
 	return metadataDevice, nil
 }
 
-func DockerZfsFilesystem(info dockertypes.Info) (string, error) {
+func DockerZfsFilesystem(info dockersystem.Info) (string, error) {
 	filesystem := DriverStatusValue(info.DriverStatus, DriverStatusParentDataset)
 	if len(filesystem) == 0 {
 		return "", fmt.Errorf("Could not get zfs filesystem")
@@ -83,7 +84,7 @@ func DockerZfsFilesystem(info dockertypes.Info) (string, error) {
 	return filesystem, nil
 }
 
-func SummariesToImages(summaries []dockertypes.ImageSummary) ([]v1.DockerImage, error) {
+func SummariesToImages(summaries []dockerimage.Summary) ([]v1.DockerImage, error) {
 	var out []v1.DockerImage
 	const unknownTag = "<none>:<none>"
 	for _, summary := range summaries {

container/podman/podman.go

@@ -23,6 +23,8 @@ import (
 	"time"
 
 	dockertypes "github.com/docker/docker/api/types"
+	dockerimage "github.com/docker/docker/api/types/image"
+	dockersystem "github.com/docker/docker/api/types/system"
 	"github.com/pkg/errors"
 
 	"github.com/google/cadvisor/container/docker"
@@ -92,7 +94,7 @@ func apiGetRequest(url string, item interface{}) error {
 }
 
 func Images() ([]v1.DockerImage, error) {
-	var summaries []dockertypes.ImageSummary
+	var summaries []dockerimage.Summary
 	err := apiGetRequest("http://d/v1.0.0/images/json", &summaries)
 	if err != nil {
 		return nil, err
@@ -109,8 +111,8 @@ func Status() (v1.DockerStatus, error) {
 	return docker.StatusFromDockerInfo(*podmanInfo)
 }
 
-func GetInfo() (*dockertypes.Info, error) {
-	var info dockertypes.Info
+func GetInfo() (*dockersystem.Info, error) {
+	var info dockersystem.Info
 	err := apiGetRequest("http://d/v1.0.0/info", &info)
 	return &info, err
 }