Skip to content

Commit abdee12

Browse files
Kern--Kern--
authored
Merge pull request firecracker-microvm#539 from kzys/ctrd-157
Upgrade containerd from 1.5.4 to 1.5.7
2 parents 1afcead + c84e135 commit abdee12

File tree

5 files changed

+103
-50
lines changed

5 files changed

+103
-50
lines changed

‎.buildkite/pipeline.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@ steps:
6565
- test -z "$(git status --porcelain)" && exit 0 || git status && echo -e '\nGenerated protobuf code differs from committed, please run "make proto" and commit the updated files.\n' && exit 1
6666
timeout_in_minutes: 1
6767

68-
- label: ":golang: go mod tidy"
69-
agents:
70-
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
71-
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
72-
hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
73-
env:
74-
DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
75-
command:
76-
- make tidy-in-docker
77-
- test -z "$(git status --porcelain)" && exit 0 || git status && echo -e '\ngo.mod and/or go.sum differ from committed, please run "go mod tidy" and commit the updated files.\n' && exit 1
78-
timeout_in_minutes: 1
79-
8068
- label: ":gear: unit tests"
8169
agents:
8270
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"

‎.github/workflows/build.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,13 @@ jobs:
4747
- run: |
4848
make tidy
4949
git diff --exit-code
50-
# The result of "go mod tidy" is different since Go 1.16.
51-
# We will use the old result until we update BuildKite and other environments.
52-
if: matrix.go < '1.16'
50+
# opencontainers/selinux uses Go 1.16's io/fs package with "go1.16"
51+
# build tag. However, since go mod tidy acts as like all build tags
52+
# are enabled, the file below included in go mod tidy, even
53+
# Go is < 1.16.
54+
# https://github.com/opencontainers/selinux/blob/v1.9.1/go-selinux/rchcon.go
55+
# https://golang.org/ref/mod
56+
if: matrix.go >= '1.16'
5357
- run: |
5458
make proto
5559
git diff --exit-code

‎firecracker-control/cmd/containerd/gomod_test.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License"). You may
4+
// not use this file except in compliance with the License. A copy of the
5+
// License is located at
6+
//
7+
// http://aws.amazon.com/apache2.0/
8+
//
9+
// or in the "license" file accompanying this file. This file is distributed
10+
// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11+
// express or implied. See the License for the specific language governing
12+
// permissions and limitations under the License.
13+
14+
package main
15+
16+
import "github.com/containerd/containerd/cmd/ctr/app"
17+
18+
// Right now, firecracker-ctr command is built by Makefile.
19+
// Go's toolchain is not aware about the command and "go mod tidy" removes
20+
// the command's dependencies.
21+
// This test file makes the ctr command "visible" from Go's toolchain.
22+
var _ = app.New

‎go.mod

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
module github.com/firecracker-microvm/firecracker-containerd
22

33
require (
4+
github.com/Microsoft/go-winio v0.5.0 // indirect
5+
github.com/Microsoft/hcsshim v0.8.22 // indirect
46
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
57
github.com/awslabs/tc-redirect-tap v0.0.0-20200708224642-a0300978797d
6-
github.com/containerd/containerd v1.5.4
8+
github.com/bits-and-blooms/bitset v1.2.1 // indirect
9+
github.com/containerd/containerd v1.5.7
10+
github.com/containerd/continuity v0.2.0 // indirect
711
github.com/containerd/fifo v1.0.0
812
github.com/containerd/go-runc v1.0.0
913
github.com/containerd/ttrpc v1.0.2
@@ -13,22 +17,31 @@ require (
1317
github.com/firecracker-microvm/firecracker-go-sdk v0.22.1-0.20210520223842-abd0815b8bf9
1418
github.com/go-ole/go-ole v1.2.4 // indirect
1519
github.com/gofrs/uuid v3.3.0+incompatible
20+
github.com/gogo/googleapis v1.4.1 // indirect
1621
github.com/gogo/protobuf v1.3.2
17-
github.com/golang/protobuf v1.4.3
22+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
23+
github.com/golang/protobuf v1.5.2
24+
github.com/google/uuid v1.3.0 // indirect
1825
github.com/hashicorp/go-multierror v1.1.0
26+
github.com/klauspost/compress v1.13.6 // indirect
1927
github.com/mdlayher/vsock v0.0.0-20190329173812-a92c53d5dcab
2028
github.com/miekg/dns v1.1.25
21-
github.com/opencontainers/runc v1.0.0-rc95
22-
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
29+
github.com/opencontainers/runc v1.0.2
30+
github.com/opencontainers/runtime-spec v1.0.3-0.20210910115017-0d6cc581aeea
31+
github.com/opencontainers/selinux v1.8.5 // indirect
2332
github.com/pkg/errors v0.9.1
2433
github.com/shirou/gopsutil v2.18.12+incompatible
2534
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
26-
github.com/sirupsen/logrus v1.8.0
35+
github.com/sirupsen/logrus v1.8.1
2736
github.com/stretchr/testify v1.6.1
2837
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
29-
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
30-
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
31-
google.golang.org/grpc v1.34.0
38+
go.opencensus.io v0.23.0 // indirect
39+
golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b // indirect
40+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
41+
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef
42+
golang.org/x/text v0.3.7 // indirect
43+
google.golang.org/genproto v0.0.0-20211005153810-c76a74d43a8e // indirect
44+
google.golang.org/grpc v1.41.0
3245
)
3346

3447
replace (

0 commit comments

Comments
 (0)