Skip to content

Commit 87dbc71

Browse files
shoenigshoenig
committed
deps: upgrade docker and runc
This PR upgrades - docker dependency to the latest tagged release (v20.10.12) - runc dependency to the latest tagged release (v1.0.3) Docker does not abide by [semver](moby/moby#39302), so it is marked +incompatible, and transitive dependencies are upgrade manually. Runc made three relevant breaking changes * cgroup manager .Set changed to accept Resources instead of Cgroup opencontainers/runc@3f65946 * config.Device moved to devices.Device opencontainers/runc#2679 * mountinfo.Mounted now returns an error if the specified path does not exist https://github.com/moby/sys/blob/mountinfo/v0.5.0/mountinfo/mountinfo.go#L16
1 parent 8d28bfe commit 87dbc71

File tree

8 files changed

+510
-115
lines changed

8 files changed

+510
-115
lines changed

‎.changelog/10832.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
```release-note:improvements
2+
deps: Update `docker/docker` dependency to `v20.10.12`
3+
deps: Update `opencontainers/runc` dependency to `v1.0.3`
4+
```

‎client/pluginmanager/csimanager/volume.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,14 @@ func (v *volumeManager) ensureAllocDir(vol *structs.CSIVolume, alloc *structs.Al
117117

118118
// Validate that the target is not already a mount point
119119
targetPath := v.targetForVolume(v.mountRoot, vol.ID, alloc.ID, usage)
120+
120121
m := mount.New()
121122
isNotMount, err := m.IsNotAMountPoint(targetPath)
122-
if err != nil {
123+
124+
switch {
125+
case errors.Is(err, os.ErrNotExist):
126+
// ignore; path does not exist and as such is not a mount
127+
case err != nil:
123128
return "", false, fmt.Errorf("mount point detection failed for volume (%s): %v", vol.ID, err)
124129
}
125130

‎client/pluginmanager/csimanager/volume_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ func TestVolumeManager_publishVolume(t *testing.T) {
279279
if !checkMountSupport() {
280280
t.Skip("mount point detection not supported for this platform")
281281
}
282+
282283
t.Parallel()
283284

284285
cases := []struct {
@@ -397,7 +398,6 @@ func TestVolumeManager_publishVolume(t *testing.T) {
397398
if tc.ExpectedVolumeCapability != nil {
398399
require.Equal(t, tc.ExpectedVolumeCapability, csiFake.PrevVolumeCapability)
399400
}
400-
401401
})
402402
}
403403
}

‎drivers/shared/executor/executor_linux.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ import (
1515
"syscall"
1616
"time"
1717

18-
"github.com/hashicorp/nomad/drivers/shared/capabilities"
19-
"github.com/opencontainers/runtime-spec/specs-go"
20-
2118
"github.com/armon/circbuf"
2219
"github.com/hashicorp/consul-template/signals"
2320
hclog "github.com/hashicorp/go-hclog"
2421
"github.com/hashicorp/nomad/client/allocdir"
2522
"github.com/hashicorp/nomad/client/stats"
2623
cstructs "github.com/hashicorp/nomad/client/structs"
24+
"github.com/hashicorp/nomad/drivers/shared/capabilities"
2725
shelpers "github.com/hashicorp/nomad/helper/stats"
2826
"github.com/hashicorp/nomad/helper/uuid"
2927
"github.com/hashicorp/nomad/nomad/structs"
3028
"github.com/hashicorp/nomad/plugins/drivers"
3129
"github.com/opencontainers/runc/libcontainer"
3230
"github.com/opencontainers/runc/libcontainer/cgroups"
3331
lconfigs "github.com/opencontainers/runc/libcontainer/configs"
32+
"github.com/opencontainers/runc/libcontainer/devices"
3433
ldevices "github.com/opencontainers/runc/libcontainer/devices"
3534
"github.com/opencontainers/runc/libcontainer/specconv"
3635
lutils "github.com/opencontainers/runc/libcontainer/utils"
36+
"github.com/opencontainers/runtime-spec/specs-go"
3737
"golang.org/x/sys/unix"
3838
)
3939

@@ -784,14 +784,14 @@ func newLibcontainerConfig(command *ExecCommand) (*lconfigs.Config, error) {
784784
}
785785

786786
// cmdDevices converts a list of driver.DeviceConfigs into excutor.Devices.
787-
func cmdDevices(devices []*drivers.DeviceConfig) ([]*lconfigs.Device, error) {
788-
if len(devices) == 0 {
787+
func cmdDevices(driverDevices []*drivers.DeviceConfig) ([]*devices.Device, error) {
788+
if len(driverDevices) == 0 {
789789
return nil, nil
790790
}
791791

792-
r := make([]*lconfigs.Device, len(devices))
792+
r := make([]*devices.Device, len(driverDevices))
793793

794-
for i, d := range devices {
794+
for i, d := range driverDevices {
795795
ed, err := ldevices.DeviceFromPath(d.HostPath, d.Permissions)
796796
if err != nil {
797797
return nil, fmt.Errorf("failed to make device out for %s: %v", d.HostPath, err)

‎drivers/shared/executor/executor_universal_linux.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func DestroyCgroup(groups *lconfigs.Cgroup, executorPid int) error {
121121
// Freeze the Cgroup so that it can not continue to fork/exec.
122122
groups.Resources.Freezer = lconfigs.Frozen
123123
freezer := cgroupFs.FreezerGroup{}
124-
if err := freezer.Set(groups.Paths[freezer.Name()], groups); err != nil {
124+
if err := freezer.Set(groups.Paths[freezer.Name()], groups.Resources); err != nil {
125125
return err
126126
}
127127

@@ -133,7 +133,7 @@ func DestroyCgroup(groups *lconfigs.Cgroup, executorPid int) error {
133133
// Unfreeze the cgroup.
134134
groups.Resources.Freezer = lconfigs.Thawed
135135
freezer := cgroupFs.FreezerGroup{}
136-
if err := freezer.Set(groups.Paths[freezer.Name()], groups); err != nil {
136+
if err := freezer.Set(groups.Paths[freezer.Name()], groups.Resources); err != nil {
137137
multierror.Append(mErrs, fmt.Errorf("failed to unfreeze cgroup: %v", err))
138138
return mErrs.ErrorOrNil()
139139
}
@@ -155,7 +155,7 @@ func DestroyCgroup(groups *lconfigs.Cgroup, executorPid int) error {
155155

156156
// Unfreeze the cgroug so we can wait.
157157
groups.Resources.Freezer = lconfigs.Thawed
158-
if err := freezer.Set(groups.Paths[freezer.Name()], groups); err != nil {
158+
if err := freezer.Set(groups.Paths[freezer.Name()], groups.Resources); err != nil {
159159
multierror.Append(mErrs, fmt.Errorf("failed to unfreeze cgroup: %v", err))
160160
return mErrs.ErrorOrNil()
161161
}

‎go.mod

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ replace github.com/hashicorp/nomad/api => ./api
1717

1818
require (
1919
github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5
20-
github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873
20+
github.com/Microsoft/go-winio v0.4.17
2121
github.com/NYTimes/gziphandler v1.0.1
2222
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e
2323
github.com/armon/go-metrics v0.3.10
24-
github.com/aws/aws-sdk-go v1.42.6
24+
github.com/aws/aws-sdk-go v1.42.27
2525
github.com/boltdb/bolt v1.3.1
2626
github.com/container-storage-interface/spec v1.4.0
27-
github.com/containerd/go-cni v0.0.0-20190904155053-d20b7eebc7ee
28-
github.com/containernetworking/cni v0.7.2-0.20190612152420-dc953e2fd91f
29-
github.com/containernetworking/plugins v0.7.3-0.20190501191748-2d6d46d308b2
30-
github.com/coreos/go-iptables v0.4.3-0.20190724151750-969b135e941d
27+
github.com/containerd/go-cni v1.1.1
28+
github.com/containernetworking/cni v1.0.1
29+
github.com/containernetworking/plugins v0.9.1
30+
github.com/coreos/go-iptables v0.5.0
3131
github.com/coreos/go-semver v0.3.0
32-
github.com/docker/cli v0.0.0-20200303215952-eb310fca4956
32+
github.com/docker/cli v20.10.3-0.20220113150236-6e2838e18645+incompatible
3333
github.com/docker/distribution v2.7.1+incompatible
34-
github.com/docker/docker v17.12.0-ce-rc1.0.20200330121334-7f8b4b621b5d+incompatible
34+
github.com/docker/docker v20.10.12+incompatible
3535
github.com/docker/go-units v0.4.0
36-
github.com/docker/libnetwork v0.8.0-dev.2.0.20200612180813-9e99af28df21
36+
github.com/docker/libnetwork v0.8.0-dev.2.0.20210525090646-64b7a4574d14
3737
github.com/dustin/go-humanize v1.0.0
3838
github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f
3939
github.com/fatih/color v1.13.0
@@ -97,12 +97,14 @@ require (
9797
github.com/mitchellh/hashstructure v1.0.0
9898
github.com/mitchellh/mapstructure v1.4.2
9999
github.com/mitchellh/reflectwalk v1.0.1
100-
github.com/opencontainers/runc v1.0.0-rc93
101-
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
100+
github.com/moby/sys/mount v0.3.0
101+
github.com/moby/sys/mountinfo v0.5.0
102+
github.com/opencontainers/runc v1.0.3
103+
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
102104
github.com/pkg/errors v0.9.1
103105
github.com/posener/complete v1.2.3
104-
github.com/prometheus/client_golang v1.4.0
105-
github.com/prometheus/common v0.9.1
106+
github.com/prometheus/client_golang v1.7.1
107+
github.com/prometheus/common v0.10.0
106108
github.com/rs/cors v1.8.0
107109
github.com/ryanuber/columnize v2.1.1-0.20170703205827-abc90934186a+incompatible
108110
github.com/ryanuber/go-glob v1.0.0
@@ -115,7 +117,7 @@ require (
115117
github.com/zclconf/go-cty-yaml v1.0.2
116118
go.uber.org/goleak v1.1.12
117119
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
118-
golang.org/x/net v0.0.0-20211108170745-6635138e15ea
120+
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
119121
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
120122
golang.org/x/sys v0.0.0-20211109065445-02f5c0300f6e
121123
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
@@ -127,21 +129,21 @@ require (
127129
require (
128130
cloud.google.com/go v0.97.0 // indirect
129131
cloud.google.com/go/storage v1.18.2 // indirect
130-
github.com/Azure/azure-sdk-for-go v44.0.0+incompatible // indirect
131-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
132+
github.com/Azure/azure-sdk-for-go v56.3.0+incompatible // indirect
133+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
132134
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
133-
github.com/Azure/go-autorest/autorest v0.11.4 // indirect
134-
github.com/Azure/go-autorest/autorest/adal v0.9.2 // indirect
135+
github.com/Azure/go-autorest/autorest v0.11.20 // indirect
136+
github.com/Azure/go-autorest/autorest/adal v0.9.15 // indirect
135137
github.com/Azure/go-autorest/autorest/azure/auth v0.5.1 // indirect
136138
github.com/Azure/go-autorest/autorest/azure/cli v0.4.0 // indirect
137139
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
138140
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
139141
github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect
140-
github.com/Azure/go-autorest/logger v0.2.0 // indirect
142+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
141143
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
142144
github.com/BurntSushi/toml v0.4.1 // indirect
143145
github.com/DataDog/datadog-go v3.2.0+incompatible // indirect
144-
github.com/Microsoft/hcsshim v0.8.9 // indirect
146+
github.com/Microsoft/hcsshim v0.8.23 // indirect
145147
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
146148
github.com/VividCortex/ewma v1.1.1 // indirect
147149
github.com/agext/levenshtein v1.2.1 // indirect
@@ -151,44 +153,44 @@ require (
151153
github.com/beorn7/perks v1.0.1 // indirect
152154
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
153155
github.com/bgentry/speakeasy v0.1.0 // indirect
156+
github.com/bits-and-blooms/bitset v1.2.0 // indirect
154157
github.com/bmatcuk/doublestar v1.1.5 // indirect
155158
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
156159
github.com/cespare/xxhash/v2 v2.1.2 // indirect
157-
github.com/checkpoint-restore/go-criu/v4 v4.1.0 // indirect
160+
github.com/checkpoint-restore/go-criu/v5 v5.0.0 // indirect
158161
github.com/cheggaaa/pb/v3 v3.0.5 // indirect
159-
github.com/cilium/ebpf v0.2.0 // indirect
162+
github.com/cilium/ebpf v0.6.2 // indirect
160163
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect
161164
github.com/circonus-labs/circonusllhist v0.1.3 // indirect
162165
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
163166
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
164-
github.com/containerd/console v1.0.1 // indirect
165-
github.com/containerd/containerd v1.3.4 // indirect
166-
github.com/containerd/continuity v0.0.0-20200709052629-daa8e1ccc0bc // indirect
167-
github.com/coreos/go-systemd/v22 v22.1.0 // indirect
167+
github.com/containerd/cgroups v1.0.2 // indirect
168+
github.com/containerd/console v1.0.3 // indirect
169+
github.com/containerd/containerd v1.5.9 // indirect
170+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
168171
github.com/cyphar/filepath-securejoin v0.2.3-0.20190205144030-7efe413b52e1 // indirect
169172
github.com/davecgh/go-spew v1.1.1 // indirect
170173
github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba // indirect
171-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
172174
github.com/digitalocean/godo v1.10.0 // indirect
173175
github.com/dimchansky/utfbom v1.1.0 // indirect
174-
github.com/docker/docker-credential-helpers v0.6.2-0.20180719074751-73e5f5dbfea3 // indirect
176+
github.com/docker/docker-credential-helpers v0.6.4 // indirect
175177
github.com/docker/go-connections v0.4.0 // indirect
176178
github.com/docker/go-metrics v0.0.1 // indirect
177179
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
178180
github.com/envoyproxy/go-control-plane v0.10.0 // indirect
179181
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
180-
github.com/fsnotify/fsnotify v1.4.9 // indirect
181182
github.com/go-ole/go-ole v1.2.4 // indirect
182-
github.com/godbus/dbus/v5 v5.0.3 // indirect
183-
github.com/gogo/protobuf v1.3.1 // indirect
183+
github.com/godbus/dbus/v5 v5.0.4 // indirect
184+
github.com/gogo/protobuf v1.3.2 // indirect
185+
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
184186
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
185187
github.com/google/btree v1.0.0 // indirect
186188
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
187-
github.com/google/uuid v1.1.2 // indirect
189+
github.com/google/uuid v1.2.0 // indirect
188190
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
189191
github.com/gookit/color v1.3.1 // indirect
190192
github.com/gophercloud/gophercloud v0.1.0 // indirect
191-
github.com/gorilla/mux v1.7.4 // indirect
193+
github.com/gorilla/mux v1.8.0 // indirect
192194
github.com/hashicorp/errwrap v1.1.0 // indirect
193195
github.com/hashicorp/go-retryablehttp v0.6.7 // indirect
194196
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
@@ -203,24 +205,23 @@ require (
203205
github.com/mattn/go-isatty v0.0.14 // indirect
204206
github.com/mattn/go-runewidth v0.0.7 // indirect
205207
github.com/mattn/go-shellwords v1.0.10 // indirect
206-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
208+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
207209
github.com/mitchellh/go-homedir v1.1.0 // indirect
208210
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
209-
github.com/moby/sys/mountinfo v0.4.0 // indirect
211+
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
210212
github.com/morikuni/aec v1.0.0 // indirect
211213
github.com/mrunalp/fileutils v0.5.0 // indirect
212214
github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect
213215
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
214216
github.com/oklog/run v1.0.1-0.20180308005104-6934b124db28 // indirect
215-
github.com/onsi/gomega v1.9.0 // indirect
216217
github.com/opencontainers/go-digest v1.0.0 // indirect
217-
github.com/opencontainers/image-spec v1.0.1 // indirect
218-
github.com/opencontainers/selinux v1.8.0 // indirect
218+
github.com/opencontainers/image-spec v1.0.2 // indirect
219+
github.com/opencontainers/selinux v1.8.2 // indirect
219220
github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect
220221
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
221222
github.com/pmezard/go-difflib v1.0.0 // indirect
222223
github.com/prometheus/client_model v0.2.0 // indirect
223-
github.com/prometheus/procfs v0.0.8 // indirect
224+
github.com/prometheus/procfs v0.6.0 // indirect
224225
github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 // indirect
225226
github.com/rogpeppe/go-internal v1.6.1 // indirect
226227
github.com/seccomp/libseccomp-golang v0.9.2-0.20200314001724-bdab42bd5128 // indirect
@@ -233,12 +234,11 @@ require (
233234
github.com/tklauser/numcpus v0.2.2 // indirect
234235
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect
235236
github.com/ulikunitz/xz v0.5.10 // indirect
236-
github.com/vishvananda/netlink v1.1.0 // indirect
237-
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
237+
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect
238+
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
238239
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
239240
github.com/vmihailenco/tagparser v0.1.1 // indirect
240241
github.com/vmware/govmomi v0.18.0 // indirect
241-
github.com/willf/bitset v1.1.11 // indirect
242242
go.opencensus.io v0.23.0 // indirect
243243
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
244244
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
@@ -253,6 +253,6 @@ require (
253253
gopkg.in/fsnotify.v1 v1.4.7 // indirect
254254
gopkg.in/resty.v1 v1.12.0 // indirect
255255
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
256-
gopkg.in/yaml.v2 v2.3.0 // indirect
256+
gopkg.in/yaml.v2 v2.4.0 // indirect
257257
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
258258
)

0 commit comments

Comments
 (0)