Skip to content

Commit

Permalink
Bump docker dependency (kubevirt#1067)
Browse files Browse the repository at this point in the history
Fix a "invalid Host Header" error with
few Go versions

Signed-off-by: Luboslav Pivarc <lpivarc@redhat.com>
  • Loading branch information
xpivarc authored Aug 31, 2023
1 parent beb5872 commit 7a80619
Show file tree
Hide file tree
Showing 566 changed files with 24,574 additions and 36,215 deletions.
4 changes: 2 additions & 2 deletions cluster-provision/gocli/cmd/provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,14 @@ func provisionCluster(cmd *cobra.Command, args []string) (retErr error) {
nodeName := nodeNameFromIndex(1)
nodeNum := fmt.Sprintf("%02d", 1)

vol, err := cli.VolumeCreate(ctx, volume.VolumeCreateBody{
vol, err := cli.VolumeCreate(ctx, volume.CreateOptions{
Name: fmt.Sprintf("%s-%s", prefix, nodeName),
})
if err != nil {
return err
}
volumes <- vol.Name
registryVol, err := cli.VolumeCreate(ctx, volume.VolumeCreateBody{
registryVol, err := cli.VolumeCreate(ctx, volume.CreateOptions{
Name: fmt.Sprintf("%s-%s", prefix, "registry"),
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cluster-provision/gocli/containers/dnsmasq.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type DNSMasqOptions struct {
Prefix string
}

func DNSMasq(cli *client.Client, ctx context.Context, options *DNSMasqOptions) (*container.ContainerCreateCreatedBody, error) {
func DNSMasq(cli *client.Client, ctx context.Context, options *DNSMasqOptions) (*container.CreateResponse, error) {
// Mount /lib/modules at dnsmasq if it's there since sometimes
// some kernel modules may be mounted
dnsmasqMounts := []mount.Mount{}
Expand Down
8 changes: 6 additions & 2 deletions cluster-provision/gocli/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh/terminal"
Expand Down Expand Up @@ -41,12 +42,15 @@ func filterByPrefix(containers []types.Container, prefix string) []types.Contain
return prefixedConatiners
}

func GetPrefixedVolumes(cli *client.Client, prefix string) ([]*types.Volume, error) {
func GetPrefixedVolumes(cli *client.Client, prefix string) ([]*volume.Volume, error) {
args := filters.NewArgs(filters.KeyValuePair{
Key: "name",
Value: prefix,
})
volumes, err := cli.VolumeList(context.Background(), args)
options := volume.ListOptions{
Filters: args,
}
volumes, err := cli.VolumeList(context.Background(), options)
if err != nil {
return nil, err
}
Expand Down
17 changes: 9 additions & 8 deletions cluster-provision/gocli/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ go 1.18

require (
github.com/alessio/shellescape v1.4.1
github.com/docker/docker v20.10.24+incompatible
github.com/docker/docker v24.0.5+incompatible
github.com/docker/go-connections v0.4.0
github.com/onsi/ginkgo/v2 v2.9.1
github.com/onsi/gomega v1.27.3
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/sirupsen/logrus v1.9.0
github.com/spf13/afero v1.9.5
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
Expand All @@ -19,28 +19,29 @@ require (
k8s.io/apimachinery v0.20.6
)

require (
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
github.com/klauspost/compress v1.11.13 // indirect
github.com/moby/patternmatcher v0.5.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
)

require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/hcsshim v0.8.25 // indirect
github.com/containerd/cgroups v1.0.3 // indirect
github.com/containerd/containerd v1.5.18 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/moby/sys/mount v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.5.0 // indirect
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
Expand Down
73 changes: 14 additions & 59 deletions cluster-provision/gocli/go.sum

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 7a80619

Please sign in to comment.