Skip to content

Commit 6ac30cf

Browse files
Bump github.com/docker/docker from 27.5.1+incompatible to 28.0.4+incompatible in /functional_tests (#1743)
* Bump github.com/docker/docker in /functional_tests Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.5.1+incompatible to 28.0.4+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v27.5.1...v28.0.4) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-version: 28.0.4+incompatible dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * [chore] update docker network type --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jina Jain <[email protected]>
1 parent 03323c8 commit 6ac30cf

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

functional_tests/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module github.com/signalfx/splunk-otel-collector-chart/functional_tests
66
go 1.24.0
77

88
require (
9-
github.com/docker/docker v27.5.1+incompatible
9+
github.com/docker/docker v28.0.4+incompatible
1010
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.121.0
1111
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.121.0
1212
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.121.0
@@ -23,6 +23,7 @@ require (
2323
k8s.io/api v0.32.2
2424
k8s.io/apiextensions-apiserver v0.32.2
2525
k8s.io/apimachinery v0.32.2
26+
k8s.io/cli-runtime v0.32.1
2627
k8s.io/client-go v0.32.2
2728
sigs.k8s.io/yaml v1.4.0
2829
)
@@ -201,7 +202,6 @@ require (
201202
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
202203
gopkg.in/inf.v0 v0.9.1 // indirect
203204
k8s.io/apiserver v0.32.2 // indirect
204-
k8s.io/cli-runtime v0.32.1 // indirect
205205
k8s.io/component-base v0.32.2 // indirect
206206
k8s.io/klog/v2 v2.130.1 // indirect
207207
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect

functional_tests/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,8 @@ github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbT
682682
github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
683683
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
684684
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
685-
github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
686-
github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
685+
github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok=
686+
github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
687687
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
688688
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
689689
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=

functional_tests/internal/common.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
"k8s.io/client-go/kubernetes"
2222

23-
"github.com/docker/docker/api/types"
23+
"github.com/docker/docker/api/types/network"
2424
docker "github.com/docker/docker/client"
2525
"github.com/stretchr/testify/require"
2626
)
@@ -42,7 +42,7 @@ func HostEndpoint(t *testing.T) string {
4242
client.NegotiateAPIVersion(context.Background())
4343
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
4444
defer cancel()
45-
network, err := client.NetworkInspect(ctx, "kind", types.NetworkInspectOptions{})
45+
network, err := client.NetworkInspect(ctx, "kind", network.InspectOptions{})
4646
require.NoError(t, err)
4747
for _, ipam := range network.IPAM.Config {
4848
if ipam.Gateway != "" {

0 commit comments

Comments
 (0)