Skip to content

Commit 9c3272e

Browse files
kiashokhelsaawy
kiashok
and
helsaawy
authored
[release/0.11] Cherry-pick testing fixes from v0.10.0-rc.9 and update containerd version used (#1881)
* update to latest containerd/1.6 tag v1.6.23 Signed-off-by: Kirtana Ashok <[email protected]> * fix integration test failure (#1799) Signed-off-by: Hamza El-Saawy <[email protected]> (cherry picked from commit f5c5797) Signed-off-by: Kirtana Ashok <[email protected]> * Checkout appropriate containerd ref Signed-off-by: Kirtana Ashok <[email protected]> * skip failing test, use gotestsum (#1820) Signed-off-by: Hamza El-Saawy <[email protected]> (cherry picked from commit 4ede1fd) Signed-off-by: Kirtana Ashok <[email protected]> * Cleanup tests that are skipped in CI: Removes TestConvert() from being skipped as corresponding fix made to v1.6.22 Skip TestContainerSymlinkVolumes() tests as it seems to pass only with containerd/1.7 Signed-off-by: Kirtana Ashok <[email protected]> --------- Signed-off-by: Kirtana Ashok <[email protected]> Signed-off-by: Hamza El-Saawy <[email protected]> Co-authored-by: Hamza El-Saawy <[email protected]>
1 parent 750e11b commit 9c3272e

62 files changed

Lines changed: 1435 additions & 504 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 53 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,36 @@ jobs:
5656
- uses: actions/checkout@v3
5757
with:
5858
path: "go/src/github.com/Microsoft/hcsshim"
59+
name: Checkout hcsshim
60+
61+
- name: Get containerd ref
62+
shell: powershell
63+
run: |
64+
$v = go list -m -f '{{ .Version }}' 'github.com/containerd/containerd' 2>&1
65+
if ( $LASTEXITCODE ) {
66+
Write-Output '::error::Could not retrieve containerd version.'
67+
exit $LASTEXITCODE
68+
}
69+
Write-Output "containerd ref is: $v"
70+
"containerd_ref=$v" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
71+
working-directory: go/src/github.com/Microsoft/hcsshim
72+
5973
# Install protoc-gen-gogoctrd in D:\bin
6074
- uses: actions/checkout@v3
6175
with:
6276
repository: containerd/containerd
63-
ref: v1.6.2
6477
path: "containerd"
78+
ref: "${{ env.containerd_ref }}"
79+
name: Checkout containerd
80+
6581
- name: Install protoc-gen-gogoctrd
6682
shell: powershell
6783
run: |
6884
cd containerd
6985
go build ./cmd/protoc-gen-gogoctrd
7086
mkdir D:\bin
7187
mv protoc-gen-gogoctrd.exe D:\bin
88+
7289
# Install protoc in D:\bin
7390
- name: Install protoc
7491
shell: powershell
@@ -77,6 +94,7 @@ jobs:
7794
Expand-Archive -Path protoc.zip -DestinationPath .
7895
mv include go/src/github.com/Microsoft/hcsshim/protobuf
7996
mv bin\protoc.exe D:\bin
97+
8098
- name: Run Protobuild
8199
shell: powershell
82100
run: |
@@ -260,12 +278,27 @@ jobs:
260278
261279
- uses: actions/checkout@v3
262280
with:
263-
path: src/github.com/containerd/containerd
264-
repository: "containerd/containerd"
281+
path: src/github.com/Microsoft/hcsshim
282+
name: Checkout hcsshim
283+
284+
- name: Get containerd ref
285+
shell: powershell
286+
run: |
287+
$v = go list -m -f '{{ .Version }}' 'github.com/containerd/containerd' 2>&1
288+
if ( $LASTEXITCODE ) {
289+
Write-Output '::error::Could not retrieve containerd version.'
290+
exit $LASTEXITCODE
291+
}
292+
Write-Output "containerd ref is: $v"
293+
"containerd_ref=$v" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
294+
working-directory: src/github.com/Microsoft/hcsshim
265295

266296
- uses: actions/checkout@v3
267297
with:
268-
path: src/github.com/Microsoft/hcsshim
298+
path: src/github.com/containerd/containerd
299+
repository: "containerd/containerd"
300+
ref: "${{ env.containerd_ref }}"
301+
name: Checkout containerd
269302

270303
- name: Install crictl
271304
shell: powershell
@@ -283,21 +316,18 @@ jobs:
283316
exit $LASTEXITCODE
284317
}
285318
319+
# needs to be a separate step since terminal reload is required to bring in new env variables and PATH
320+
- name: Upgrade Chocolaty
321+
shell: powershell
322+
run: |
323+
choco upgrade -y chocolatey 2>&1
324+
286325
- name: Install mingw
287326
shell: powershell
288327
run: |
289328
$VerbosePreference = 'Continue'
290329
# dont set $ErrorActionPreference since we want to allow choco install to fail later on
291330
292-
Write-Output '::group::Update chocolaty'
293-
choco upgrade -y chocolatey
294-
Write-Output '::endgroup::'
295-
296-
if ( $LASTEXITCODE ) {
297-
Write-Output '::error::Could not update chocolatey.'
298-
exit $LASTEXITCODE
299-
}
300-
301331
Write-Output 'Install mingw'
302332
# Install sometimes fails when downloading mingw zip from source-forge with:
303333
# "ERROR: The remote file either doesn't exist, is unauthorized, or is forbidden for url"
@@ -314,7 +344,7 @@ jobs:
314344
Sleep -Seconds 60
315345
}
316346
317-
choco install -y --no-progress --stop-on-first-failure --force mingw --allow-downgrade --version 10.2.0
347+
choco install -y --no-progress --stop-on-first-failure --force mingw --allow-downgrade --version 10.3.0
318348
Write-Output '::endgroup::'
319349
if ( -not $LASTEXITCODE ) {
320350
Write-Output "Attempt $i succeeded (exit code: $LASTEXITCODE)"
@@ -328,6 +358,9 @@ jobs:
328358
exit $LASTEXITCODE
329359
}
330360
361+
# verify mingw32-make was installed
362+
Get-Command -CommandType Application -ErrorAction Stop mingw32-make.exe
363+
331364
- name: Build binaries
332365
shell: bash
333366
working-directory: src/github.com/containerd/containerd
@@ -342,11 +375,15 @@ jobs:
342375
run: |
343376
go build -mod vendor -o "${{ github.workspace }}/src/github.com/containerd/containerd/bin/containerd-shim-runhcs-v1.exe" .\cmd\containerd-shim-runhcs-v1
344377
378+
- name: Install gotestsum
379+
run: go install gotest.tools/gotestsum@${{ env.GOTESTSUM_VERSION }}
380+
345381
- name: Run containerd integration tests
346382
shell: bash
347383
working-directory: src/github.com/containerd/containerd
348384
run: |
349-
export EXTRA_TESTFLAGS="-timeout=20m"
385+
export EXTRA_TESTFLAGS='-timeout=20m'
386+
export GOTEST='gotestsum --format=standard-verbose --debug --'
350387
make integration
351388
352389
- name: Run containerd CRI integration tests
@@ -371,7 +408,7 @@ jobs:
371408
# We skip this test here, until a new release of hcsshim is cut and the one in
372409
# containerd is updated. When the shim is updated in containerd, this test will
373410
# also need to be updated and the special case for windows, removed.
374-
FOCUS="[^TestContainerdRestart$]" make cri-integration
411+
FOCUS="[^(TestContainerdRestart|TestContainerSymlinkVolumes)]" make cri-integration
375412
376413
# Enable these tests once the required JobContainer images are updated.
377414
#

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ require (
88
github.com/cenkalti/backoff/v4 v4.2.0
99
github.com/containerd/cgroups v1.1.0
1010
github.com/containerd/console v1.0.3
11-
github.com/containerd/containerd v1.6.6
11+
github.com/containerd/containerd v1.6.23
1212
github.com/containerd/go-runc v1.0.0
13-
github.com/containerd/ttrpc v1.1.0
13+
github.com/containerd/ttrpc v1.1.2
1414
github.com/containerd/typeurl v1.0.2
1515
github.com/gogo/protobuf v1.3.2
1616
github.com/golang/mock v1.6.0
@@ -29,11 +29,11 @@ require (
2929
github.com/veraison/go-cose v1.0.0-rc.1
3030
github.com/vishvananda/netlink v1.2.1-beta.2
3131
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f
32-
go.etcd.io/bbolt v1.3.6
32+
go.etcd.io/bbolt v1.3.7
3333
go.opencensus.io v0.24.0
3434
golang.org/x/sync v0.1.0
3535
golang.org/x/sys v0.7.0
36-
google.golang.org/grpc v1.47.0
36+
google.golang.org/grpc v1.50.1
3737
)
3838

3939
require (
@@ -65,9 +65,9 @@ require (
6565
github.com/lestrrat-go/iter v1.0.1 // indirect
6666
github.com/lestrrat-go/option v1.0.0 // indirect
6767
github.com/mitchellh/go-homedir v1.1.0 // indirect
68-
github.com/moby/sys/mountinfo v0.5.0 // indirect
68+
github.com/moby/sys/mountinfo v0.6.2 // indirect
6969
github.com/opencontainers/go-digest v1.0.0 // indirect
70-
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
70+
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
7171
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
7272
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7373
github.com/vbatts/tar-split v0.11.2 // indirect
@@ -81,7 +81,7 @@ require (
8181
golang.org/x/net v0.8.0 // indirect
8282
golang.org/x/text v0.8.0 // indirect
8383
golang.org/x/tools v0.7.0 // indirect
84-
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
84+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
8585
google.golang.org/protobuf v1.29.1 // indirect
8686
gopkg.in/yaml.v2 v2.4.0 // indirect
8787
)

‎go.sum‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,17 +211,18 @@ github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTV
211211
github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
212212
github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
213213
github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
214-
github.com/containerd/containerd v1.6.6 h1:xJNPhbrmz8xAMDNoVjHy9YHtWwEQNS+CDkcIRh7t8Y0=
215214
github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0=
215+
github.com/containerd/containerd v1.6.23 h1:KYJd6UJhKHzwMhiD70iTtSmU+k4565ac22GOTI3AuTA=
216+
github.com/containerd/containerd v1.6.23/go.mod h1:UrQOiyzrLi3n4aezYJbQH6Il+YzTvnHFbEuO3yfDrM4=
216217
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
217218
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
218219
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
219220
github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo=
220221
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
221222
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
222223
github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
223-
github.com/containerd/continuity v0.2.2 h1:QSqfxcn8c+12slxwu00AtzXrsami0MJb/MQs9lOLHLA=
224224
github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk=
225+
github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
225226
github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
226227
github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
227228
github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
@@ -257,8 +258,9 @@ github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDG
257258
github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=
258259
github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
259260
github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
260-
github.com/containerd/ttrpc v1.1.0 h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI=
261261
github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ=
262+
github.com/containerd/ttrpc v1.1.2 h1:4jH6OQDQqjfVD2b5TJS5TxmGuLGmp5WW7KtW2TWOP7c=
263+
github.com/containerd/ttrpc v1.1.2/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ=
262264
github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
263265
github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk=
264266
github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg=
@@ -678,8 +680,8 @@ github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vq
678680
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
679681
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
680682
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
681-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
682683
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
684+
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
683685
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
684686
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
685687
github.com/miekg/dns v1.1.25/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
@@ -702,8 +704,9 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ
702704
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
703705
github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
704706
github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
705-
github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI=
706707
github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
708+
github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
709+
github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
707710
github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
708711
github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
709712
github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
@@ -767,8 +770,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
767770
github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
768771
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
769772
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
770-
github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
771-
github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
773+
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=
774+
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
772775
github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
773776
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
774777
github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
@@ -991,8 +994,9 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go
991994
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
992995
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
993996
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
994-
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
995997
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
998+
go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
999+
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
9961000
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
9971001
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
9981002
go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
@@ -1300,6 +1304,7 @@ golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBc
13001304
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13011305
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13021306
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1307+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13031308
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13041309
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
13051310
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1484,8 +1489,8 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
14841489
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
14851490
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
14861491
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
1487-
gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
14881492
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
1493+
gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
14891494
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
14901495
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
14911496
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎test/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ require (
66
github.com/Microsoft/go-winio v0.6.1
77
github.com/Microsoft/hcsshim v0.10.0-rc.3
88
github.com/containerd/cgroups v1.1.0
9-
github.com/containerd/containerd v1.6.12
9+
github.com/containerd/containerd v1.6.23
1010
github.com/containerd/go-runc v1.0.0
1111
github.com/containerd/ttrpc v1.2.1
1212
github.com/containerd/typeurl v1.0.2
1313
github.com/gogo/protobuf v1.3.2
1414
github.com/google/go-containerregistry v0.14.0
1515
github.com/kevpar/cri v1.11.1-0.20220302210600-4c5c347230b2
1616
github.com/opencontainers/go-digest v1.0.0
17-
github.com/opencontainers/image-spec v1.1.0-rc2
17+
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
1818
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
1919
github.com/opencontainers/runtime-tools v0.9.0
2020
github.com/pkg/errors v0.9.1
@@ -67,7 +67,7 @@ require (
6767
github.com/mattn/go-shellwords v1.0.12 // indirect
6868
github.com/mitchellh/go-homedir v1.1.0 // indirect
6969
github.com/moby/locker v1.0.1 // indirect
70-
github.com/moby/sys/mountinfo v0.5.0 // indirect
70+
github.com/moby/sys/mountinfo v0.6.2 // indirect
7171
github.com/moby/sys/signal v0.6.0 // indirect
7272
github.com/moby/sys/symlink v0.2.0 // indirect
7373
github.com/open-policy-agent/opa v0.42.2 // indirect

0 commit comments

Comments
 (0)