Skip to content

Commit 36be79a

Browse files
swagatbora90swagatbora90
authored
Merge pull request #733 from chinchaun/731-update-go-version
upgrade the min version of Go from the docs
2 parents 065b6fc + 4bef852 commit 36be79a

File tree

5 files changed

+166
-17
lines changed

5 files changed

+166
-17
lines changed

‎docker-credential-mmds/go.mod‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
module github.com/firecracker-microvm/firecracker-containerd/docker-credential-mmds
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/docker/docker-credential-helpers v0.6.4
77
github.com/stretchr/testify v1.7.1
88
)
9+
10+
require (
11+
github.com/davecgh/go-spew v1.1.0 // indirect
12+
github.com/pmezard/go-difflib v1.0.0 // indirect
13+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
14+
)

‎docs/getting-started.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ You need to have the following things in order to use firecracker-containerd:
4040
* git
4141
* gcc, required by the Firecracker agent for building
4242
* A recent installation of [Docker CE](https://docker.com).
43-
* Go 1.16 or later, which you can download from [here](https://golang.org/dl/).
43+
* Go 1.17 or later, which you can download from [here](https://golang.org/dl/).
4444

4545
## Setup
4646

‎docs/quickstart.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ files into `/usr/local/bin`.
2828

2929
cd ~
3030

31-
# Install git, Go 1.16, make, curl
31+
# Install git, Go 1.17, make, curl
3232
sudo mkdir -p /etc/apt/sources.list.d
3333
echo "deb http://ftp.debian.org/debian bullseye-backports main" | \
3434
sudo tee /etc/apt/sources.list.d/bullseye-backports.list
3535
sudo DEBIAN_FRONTEND=noninteractive apt-get update
3636
sudo DEBIAN_FRONTEND=noninteractive apt-get \
3737
install --yes \
38-
golang-1.16 \
38+
golang-1.17 \
3939
make \
4040
git \
4141
curl \
@@ -44,8 +44,8 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get \
4444
bc \
4545
gnupg
4646

47-
# Debian's Go 1.16 package installs "go" command under /usr/lib/go-1.16/bin
48-
export PATH=/usr/lib/go-1.16/bin:$PATH
47+
# Debian's Go 1.17 package installs "go" command under /usr/lib/go-1.17/bin
48+
export PATH=/usr/lib/go-1.17/bin:$PATH
4949

5050
cd ~
5151

@@ -93,7 +93,7 @@ sudo yum -y install \
9393
# need to source environment variables afterwards for the existing shell session.
9494
curl -LO https://get.golang.org/$(uname)/go_installer && \
9595
chmod +x go_installer && \
96-
./go_installer -version 1.16 && \
96+
./go_installer -version 1.17 && \
9797
rm go_installer && \
9898
source .bash_profile
9999

‎examples/cmd/remote-snapshotter/go.mod‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,46 @@
11
module github.com/firecracker-microvm/firecracker-containerd/example/remote-snapshotter
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/containerd/containerd v1.6.9
77
github.com/containerd/stargz-snapshotter v0.11.3
88
github.com/firecracker-microvm/firecracker-containerd v0.0.0-20220430002346-5f6efb9fdce8
99
)
1010

11+
require (
12+
github.com/Microsoft/go-winio v0.5.2 // indirect
13+
github.com/Microsoft/hcsshim v0.9.4 // indirect
14+
github.com/containerd/cgroups v1.0.4 // indirect
15+
github.com/containerd/continuity v0.3.0 // indirect
16+
github.com/containerd/fifo v1.1.0 // indirect
17+
github.com/containerd/ttrpc v1.1.0 // indirect
18+
github.com/containerd/typeurl v1.0.2 // indirect
19+
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
20+
github.com/gogo/googleapis v1.4.1 // indirect
21+
github.com/gogo/protobuf v1.3.2 // indirect
22+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
23+
github.com/golang/protobuf v1.5.2 // indirect
24+
github.com/google/uuid v1.3.0 // indirect
25+
github.com/klauspost/compress v1.15.6 // indirect
26+
github.com/moby/locker v1.0.1 // indirect
27+
github.com/moby/sys/mountinfo v0.6.2 // indirect
28+
github.com/moby/sys/signal v0.7.0 // indirect
29+
github.com/opencontainers/go-digest v1.0.0 // indirect
30+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
31+
github.com/opencontainers/runc v1.1.7 // indirect
32+
github.com/opencontainers/runtime-spec v1.0.3-0.20210910115017-0d6cc581aeea // indirect
33+
github.com/opencontainers/selinux v1.10.1 // indirect
34+
github.com/pkg/errors v0.9.1 // indirect
35+
github.com/sirupsen/logrus v1.8.1 // indirect
36+
go.opencensus.io v0.23.0 // indirect
37+
golang.org/x/net v0.8.0 // indirect
38+
golang.org/x/sync v0.1.0 // indirect
39+
golang.org/x/sys v0.6.0 // indirect
40+
golang.org/x/text v0.8.0 // indirect
41+
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect
42+
google.golang.org/grpc v1.47.0 // indirect
43+
google.golang.org/protobuf v1.28.0 // indirect
44+
)
45+
1146
replace github.com/firecracker-microvm/firecracker-containerd => ../../..

‎go.mod‎

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

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
76
github.com/awslabs/tc-redirect-tap v0.0.0-20211025175357-e30dfca224c2
8-
github.com/containerd/cgroups v1.0.4 // indirect
97
github.com/containerd/containerd v1.6.9
108
github.com/containerd/continuity v0.3.0
119
github.com/containerd/fifo v1.1.0
@@ -15,21 +13,15 @@ require (
1513
github.com/containernetworking/cni v1.1.1
1614
github.com/containernetworking/plugins v1.1.1
1715
github.com/firecracker-microvm/firecracker-go-sdk v0.22.1-0.20220427214706-47505a9cf951
18-
github.com/go-ole/go-ole v1.2.4 // indirect
1916
github.com/gofrs/uuid v3.3.0+incompatible
20-
github.com/gogo/googleapis v1.4.1 // indirect
2117
github.com/gogo/protobuf v1.3.2
2218
github.com/hashicorp/go-multierror v1.1.1
23-
github.com/klauspost/compress v1.15.6 // indirect
2419
github.com/miekg/dns v1.1.25
25-
github.com/moby/sys/mountinfo v0.6.2 // indirect
26-
github.com/moby/sys/signal v0.7.0 // indirect
2720
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
2821
github.com/opencontainers/runc v1.1.7
2922
github.com/opencontainers/runtime-spec v1.0.3-0.20210910115017-0d6cc581aeea
3023
github.com/pelletier/go-toml v1.9.3
3124
github.com/shirou/gopsutil v2.18.12+incompatible
32-
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
3325
github.com/sirupsen/logrus v1.8.1
3426
github.com/stretchr/testify v1.8.1
3527
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
@@ -40,6 +32,122 @@ require (
4032
google.golang.org/grpc v1.47.0
4133
)
4234

35+
require (
36+
github.com/Microsoft/go-winio v0.5.2 // indirect
37+
github.com/Microsoft/hcsshim v0.9.4 // indirect
38+
github.com/PuerkitoBio/purell v1.1.1 // indirect
39+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
40+
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
41+
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
42+
github.com/beorn7/perks v1.0.1 // indirect
43+
github.com/blang/semver v3.5.1+incompatible // indirect
44+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
45+
github.com/cilium/ebpf v0.7.0 // indirect
46+
github.com/containerd/cgroups v1.0.4 // indirect
47+
github.com/containerd/console v1.0.3 // indirect
48+
github.com/containerd/go-cni v1.1.6 // indirect
49+
github.com/containerd/imgcrypt v1.1.4 // indirect
50+
github.com/containerd/nri v0.1.0 // indirect
51+
github.com/containers/ocicrypt v1.1.3 // indirect
52+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
53+
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
54+
github.com/davecgh/go-spew v1.1.1 // indirect
55+
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
56+
github.com/docker/go-metrics v0.0.1 // indirect
57+
github.com/docker/go-units v0.4.0 // indirect
58+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
59+
github.com/fsnotify/fsnotify v1.4.9 // indirect
60+
github.com/go-logr/logr v1.2.2 // indirect
61+
github.com/go-logr/stdr v1.2.2 // indirect
62+
github.com/go-ole/go-ole v1.2.4 // indirect
63+
github.com/go-openapi/analysis v0.21.2 // indirect
64+
github.com/go-openapi/errors v0.20.2 // indirect
65+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
66+
github.com/go-openapi/jsonreference v0.19.6 // indirect
67+
github.com/go-openapi/loads v0.21.1 // indirect
68+
github.com/go-openapi/runtime v0.23.3 // indirect
69+
github.com/go-openapi/spec v0.20.4 // indirect
70+
github.com/go-openapi/strfmt v0.21.2 // indirect
71+
github.com/go-openapi/swag v0.21.1 // indirect
72+
github.com/go-openapi/validate v0.21.0 // indirect
73+
github.com/go-stack/stack v1.8.1 // indirect
74+
github.com/godbus/dbus/v5 v5.0.6 // indirect
75+
github.com/gogo/googleapis v1.4.1 // indirect
76+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
77+
github.com/golang/protobuf v1.5.2 // indirect
78+
github.com/google/go-cmp v0.5.7 // indirect
79+
github.com/google/gofuzz v1.2.0 // indirect
80+
github.com/google/uuid v1.3.0 // indirect
81+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
82+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
83+
github.com/hashicorp/errwrap v1.1.0 // indirect
84+
github.com/imdario/mergo v0.3.12 // indirect
85+
github.com/intel/goresctrl v0.2.0 // indirect
86+
github.com/josharian/intern v1.0.0 // indirect
87+
github.com/json-iterator/go v1.1.12 // indirect
88+
github.com/klauspost/compress v1.15.6 // indirect
89+
github.com/mailru/easyjson v0.7.7 // indirect
90+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
91+
github.com/mdlayher/socket v0.2.0 // indirect
92+
github.com/mdlayher/vsock v1.1.1 // indirect
93+
github.com/miekg/pkcs11 v1.1.1 // indirect
94+
github.com/mitchellh/mapstructure v1.4.3 // indirect
95+
github.com/moby/locker v1.0.1 // indirect
96+
github.com/moby/spdystream v0.2.0 // indirect
97+
github.com/moby/sys/mountinfo v0.6.2 // indirect
98+
github.com/moby/sys/signal v0.7.0 // indirect
99+
github.com/moby/sys/symlink v0.2.0 // indirect
100+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
101+
github.com/modern-go/reflect2 v1.0.2 // indirect
102+
github.com/oklog/ulid v1.3.1 // indirect
103+
github.com/opencontainers/go-digest v1.0.0 // indirect
104+
github.com/opencontainers/selinux v1.10.1 // indirect
105+
github.com/opentracing/opentracing-go v1.2.0 // indirect
106+
github.com/pkg/errors v0.9.1 // indirect
107+
github.com/pmezard/go-difflib v1.0.0 // indirect
108+
github.com/prometheus/client_golang v1.11.1 // indirect
109+
github.com/prometheus/client_model v0.2.0 // indirect
110+
github.com/prometheus/common v0.30.0 // indirect
111+
github.com/prometheus/procfs v0.7.3 // indirect
112+
github.com/russross/blackfriday/v2 v2.0.1 // indirect
113+
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
114+
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
115+
github.com/spf13/pflag v1.0.5 // indirect
116+
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
117+
github.com/tchap/go-patricia v2.2.6+incompatible // indirect
118+
github.com/urfave/cli v1.22.2 // indirect
119+
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
120+
go.etcd.io/bbolt v1.3.6 // indirect
121+
go.mongodb.org/mongo-driver v1.8.3 // indirect
122+
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
123+
go.opencensus.io v0.23.0 // indirect
124+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
125+
go.opentelemetry.io/otel v1.3.0 // indirect
126+
go.opentelemetry.io/otel/trace v1.3.0 // indirect
127+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
128+
golang.org/x/net v0.8.0 // indirect
129+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
130+
golang.org/x/term v0.6.0 // indirect
131+
golang.org/x/text v0.8.0 // indirect
132+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
133+
google.golang.org/appengine v1.6.7 // indirect
134+
google.golang.org/protobuf v1.28.0 // indirect
135+
gopkg.in/inf.v0 v0.9.1 // indirect
136+
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
137+
gopkg.in/yaml.v2 v2.4.0 // indirect
138+
gopkg.in/yaml.v3 v3.0.1 // indirect
139+
k8s.io/api v0.22.5 // indirect
140+
k8s.io/apimachinery v0.22.5 // indirect
141+
k8s.io/apiserver v0.22.5 // indirect
142+
k8s.io/client-go v0.22.5 // indirect
143+
k8s.io/component-base v0.22.5 // indirect
144+
k8s.io/cri-api v0.25.0 // indirect
145+
k8s.io/klog/v2 v2.30.0 // indirect
146+
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
147+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
148+
sigs.k8s.io/yaml v1.2.0 // indirect
149+
)
150+
43151
replace (
44152
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
45153
google.golang.org/grpc => google.golang.org/grpc v1.38.1

0 commit comments

Comments
 (0)