Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dependencies backport to 1.5.x #17282

Merged
merged 5 commits into from
May 23, 2023
Merged

dependencies backport to 1.5.x #17282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db1f750
deps: update docker to 23.0.3 (#16862)
shoenig Apr 12, 2023
41d77a0
build(deps): bump github.com/docker/distribution (#17162)
dependabot[bot] May 23, 2023
c40d0b7
build(deps): bump github.com/hashicorp/vault/sdk from 0.7.0 to 0.9.0 …
dependabot[bot] May 23, 2023
3b7f81a
build(deps): bump github.com/grpc-ecosystem/go-grpc-middleware (#16551)
dependabot[bot] May 23, 2023
9a8e018
changelog entry for Vault SDK update
tgross May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/16862.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
deps: update docker to 23.0.3
```
3 changes: 3 additions & 0 deletions .changelog/17281.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
deps: Updated Vault SDK to 0.9.0
```
4 changes: 2 additions & 2 deletions drivers/docker/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,10 +1511,10 @@ func TestDockerDriver_DNS(t *testing.T) {
require.NoError(t, task.EncodeConcreteDriverConfig(cfg))

_, d, _, cleanup := dockerSetup(t, task, nil)
defer cleanup()
t.Cleanup(cleanup)

require.NoError(t, d.WaitUntilStarted(task.ID, 5*time.Second))
defer d.DestroyTask(task.ID, true)
t.Cleanup(func() { _ = d.DestroyTask(task.ID, true) })

dtestutil.TestTaskDNSConfig(t, d, task.ID, c.cfg)
}
Expand Down
24 changes: 13 additions & 11 deletions drivers/shared/resolvconf/mount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"path/filepath"

dresolvconf "github.com/docker/libnetwork/resolvconf"
"github.com/docker/libnetwork/types"
"github.com/docker/docker/libnetwork/resolvconf"
"github.com/docker/docker/libnetwork/types"
"github.com/hashicorp/nomad/plugins/drivers"
)

Expand Down Expand Up @@ -34,15 +34,15 @@ func GenerateDNSMount(taskDir string, conf *drivers.DNSConfig) (*drivers.MountCo
return mount, nil
}

currRC, err := dresolvconf.Get()
currRC, err := resolvconf.Get()
if err != nil {
return nil, err
}

var (
dnsList = dresolvconf.GetNameservers(currRC.Content, types.IP)
dnsSearchList = dresolvconf.GetSearchDomains(currRC.Content)
dnsOptionsList = dresolvconf.GetOptions(currRC.Content)
dnsList = resolvconf.GetNameservers(currRC.Content, types.IP)
dnsSearchList = resolvconf.GetSearchDomains(currRC.Content)
dnsOptionsList = resolvconf.GetOptions(currRC.Content)
)
if nServers > 0 {
dnsList = conf.Servers
Expand All @@ -54,25 +54,27 @@ func GenerateDNSMount(taskDir string, conf *drivers.DNSConfig) (*drivers.MountCo
dnsOptionsList = conf.Options
}

_, err = dresolvconf.Build(path, dnsList, dnsSearchList, dnsOptionsList)
_, err = resolvconf.Build(path, dnsList, dnsSearchList, dnsOptionsList)
if err != nil {
return nil, err
}

return mount, nil
}

func copySystemDNS(dest string) error {
in, err := os.Open(dresolvconf.Path())
func copySystemDNS(filePath string) error {
in, err := os.Open(resolvconf.Path())
if err != nil {
return err
}
defer in.Close()
defer func() {
_ = in.Close()
}()

content, err := io.ReadAll(in)
if err != nil {
return err
}

return os.WriteFile(dest, content, 0644)
return os.WriteFile(filePath, content, 0644)
}
24 changes: 11 additions & 13 deletions drivers/shared/resolvconf/mount_unix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
//go:build !windows
// +build !windows

package resolvconf

import (
"io/ioutil"
"os"
"path/filepath"
"testing"

dresolvconf "github.com/docker/libnetwork/resolvconf"
"github.com/stretchr/testify/require"
"github.com/docker/docker/libnetwork/resolvconf"
"github.com/shoenig/test/must"
)

func Test_copySystemDNS(t *testing.T) {
require := require.New(t)
data, err := ioutil.ReadFile(dresolvconf.Path())
require.NoError(err)
data, err := os.ReadFile(resolvconf.Path())
must.NoError(t, err)

dest := filepath.Join(t.TempDir(), "resolv.conf")
resolvConfFile := filepath.Join(t.TempDir(), "resolv.conf")

require.NoError(copySystemDNS(dest))
require.FileExists(dest)
must.NoError(t, copySystemDNS(resolvConfFile))
must.FileExists(t, resolvConfFile)

tmpResolv, err := ioutil.ReadFile(dest)
require.NoError(err)
require.Equal(data, tmpResolv)
tmpResolv, readErr := os.ReadFile(resolvConfFile)
must.NoError(t, readErr)
must.Eq(t, data, tmpResolv)
}
28 changes: 12 additions & 16 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ require (
github.com/coreos/go-iptables v0.6.0
github.com/creack/pty v1.1.18
github.com/docker/cli v23.0.1+incompatible
github.com/docker/distribution v2.8.1+incompatible
github.com/docker/docker v20.10.23+incompatible
github.com/docker/distribution v2.8.2+incompatible
github.com/docker/docker v23.0.3+incompatible
github.com/docker/go-units v0.5.0
github.com/docker/libnetwork v0.8.0-dev.2.0.20210525090646-64b7a4574d14
github.com/dustin/go-humanize v1.0.0
github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f
github.com/fsouza/go-dockerclient v1.7.9
Expand All @@ -41,7 +40,7 @@ require (
github.com/gorilla/handlers v1.5.1
github.com/gorilla/websocket v1.5.0
github.com/gosuri/uilive v0.0.4
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/hashicorp/cap v0.2.0
github.com/hashicorp/consul-template v0.29.6-0.20221026140134-90370e07bf62
github.com/hashicorp/consul/api v1.18.0
Expand All @@ -57,7 +56,7 @@ require (
github.com/hashicorp/go-getter v1.7.0
github.com/hashicorp/go-hclog v1.4.0
github.com/hashicorp/go-immutable-radix/v2 v2.0.0
github.com/hashicorp/go-kms-wrapping/v2 v2.0.5
github.com/hashicorp/go-kms-wrapping/v2 v2.0.8
github.com/hashicorp/go-memdb v1.3.4
github.com/hashicorp/go-msgpack v1.1.5
github.com/hashicorp/go-multierror v1.1.1
Expand All @@ -81,9 +80,9 @@ require (
github.com/hashicorp/raft-autopilot v0.1.6
github.com/hashicorp/raft-boltdb/v2 v2.2.2
github.com/hashicorp/serf v0.10.1
github.com/hashicorp/vault/api v1.8.3
github.com/hashicorp/vault/sdk v0.7.0
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87
github.com/hashicorp/vault/api v1.9.1
github.com/hashicorp/vault/sdk v0.9.0
github.com/hashicorp/yamux v0.1.1
github.com/hpcloud/tail v1.0.1-0.20170814160653-37f427138745
github.com/kr/pretty v0.3.1
github.com/kr/text v0.2.0
Expand Down Expand Up @@ -121,7 +120,7 @@ require (
github.com/zclconf/go-cty-yaml v1.0.3
go.etcd.io/bbolt v1.3.6
go.uber.org/goleak v1.2.0
golang.org/x/crypto v0.5.0
golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a
golang.org/x/sync v0.1.0
golang.org/x/sys v0.5.0
Expand Down Expand Up @@ -158,7 +157,6 @@ require (
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/Masterminds/sprig/v3 v3.2.1
github.com/Microsoft/hcsshim v0.9.6 // indirect
github.com/VividCortex/ewma v1.1.1 // indirect
github.com/agext/levenshtein v1.2.1 // indirect
github.com/apparentlymart/go-cidr v1.0.1 // indirect
Expand All @@ -177,7 +175,6 @@ require (
github.com/cilium/ebpf v0.9.1 // indirect
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect
github.com/circonus-labs/circonusllhist v0.1.3 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/containerd v1.6.18 // indirect
github.com/coreos/go-oidc/v3 v3.1.0 // indirect
Expand Down Expand Up @@ -212,7 +209,6 @@ require (
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
github.com/hashicorp/go-secure-stdlib/reloadutil v0.1.1 // indirect
github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.2 // indirect
Expand All @@ -234,6 +230,8 @@ require (
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/pointerstructure v1.2.1
github.com/moby/patternmatcher v0.5.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/mrunalp/fileutils v0.5.0 // indirect
github.com/muesli/reflow v0.3.0
Expand All @@ -243,7 +241,6 @@ require (
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/opencontainers/selinux v1.10.1 // indirect
github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand Down Expand Up @@ -272,13 +269,12 @@ require (
github.com/vmware/govmomi v0.18.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.2.0 // indirect
golang.org/x/tools v0.3.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.103.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
Loading