go.d bump github.com/docker/docker v27.0.0+incompatible (#17921)
Ilya Mashchenko committed
Jun 17, 2024 at 10:44 UTC
9c4aae6869c54c79a65160fa32e88240fd24cb88
6 files changed
+9
-7
src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/dockerd_test.go
+2
-1
@@ -141,7 +141,8 @@ func prepareNginxContainer(name string) types.Container {
141
},
142
Labels: map[string]string{"key1": "value1"},
143
HostConfig: struct {
144
- NetworkMode string `json:",omitempty"`
144
+ NetworkMode string `json:",omitempty"`
145
+ Annotations map[string]string `json:",omitempty"`
146
}{
147
NetworkMode: "default",
148
},
src/go/collectors/go.d.plugin/go.mod
+1
-1
@@ -16,7 +16,7 @@ require (
16
github.com/clbanning/rfile/v2 v2.0.0-20231024120205-ac3fca974b0e
17
github.com/cloudflare/cfssl v1.6.5
18
github.com/coreos/go-systemd/v22 v22.5.0
19
- github.com/docker/docker v26.1.4+incompatible
19
+ github.com/docker/docker v27.0.0+incompatible
20
github.com/facebook/time v0.0.0-20240419201005-e4f24e18edf7
21
github.com/fsnotify/fsnotify v1.7.0
22
github.com/go-redis/redis/v8 v8.11.5
src/go/collectors/go.d.plugin/go.sum
+2
-2
@@ -54,8 +54,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
54
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
55
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
56
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
57
-github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
58
-github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
57
+github.com/docker/docker v27.0.0+incompatible h1:JRugTYuelmWlW0M3jakcIadDx2HUoUO6+Tf2C5jVfwA=
58
+github.com/docker/docker v27.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
59
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
60
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
61
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
src/go/collectors/go.d.plugin/modules/docker/collect.go
+2
-1
@@ -10,6 +10,7 @@ import (
10
"github.com/docker/docker/api/types"
11
typesContainer "github.com/docker/docker/api/types/container"
12
"github.com/docker/docker/api/types/filters"
13
+ typesImage "github.com/docker/docker/api/types/image"
14
)
15
16
func (d *Docker) collect() (map[string]int64, error) {
@@ -63,7 +64,7 @@ func (d *Docker) collectImages(mx map[string]int64) error {
64
ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration())
65
defer cancel()
66
66
- images, err := d.client.ImageList(ctx, types.ImageListOptions{})
67
+ images, err := d.client.ImageList(ctx, typesImage.ListOptions{})
68
if err != nil {
69
return err
70
}
src/go/collectors/go.d.plugin/modules/docker/docker.go
+1
-1
@@ -68,7 +68,7 @@ type (
68
dockerClient interface {
69
NegotiateAPIVersion(context.Context)
70
Info(context.Context) (typesSystem.Info, error)
71
- ImageList(context.Context, types.ImageListOptions) ([]typesImage.Summary, error)
71
+ ImageList(context.Context, typesImage.ListOptions) ([]typesImage.Summary, error)
72
ContainerList(context.Context, typesContainer.ListOptions) ([]types.Container, error)
73
Close() error
74
}
src/go/collectors/go.d.plugin/modules/docker/docker_test.go
+1
-1
@@ -825,7 +825,7 @@ func (m *mockClient) ContainerList(_ context.Context, opts typesContainer.ListOp
825
return containers, nil
826
}
827
828
-func (m *mockClient) ImageList(_ context.Context, _ types.ImageListOptions) ([]typesImage.Summary, error) {
828
+func (m *mockClient) ImageList(_ context.Context, _ typesImage.ListOptions) ([]typesImage.Summary, error) {
829
if m.errOnImageList {
830
return nil, errors.New("mockClient.ImageList() error")
831
}