Skip to content

Include CRI support #255

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

Closed
wants to merge 7 commits into from
Closed

Include CRI support #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c18b409
Import github.com/containerd/cri to enable CRI support
kzys Sep 3, 2019
11c548b
Add Kubernetes dependencies
kzys Sep 3, 2019
d3af1b7
Workaround Sirupsen/logrus -> sirupsen/logrus change
kzys Sep 3, 2019
b28a940
Upgrade opencontainers/runtime-spec
kzys Sep 3, 2019
7d1c68c
Upgrade docker/docker
kzys Sep 3, 2019
1ca9fdc
Finally add containerd/cri on go.mod and go.sum
kzys Sep 3, 2019
5230a91
go mod tidy + comments
kzys Sep 3, 2019
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 firecracker-control/cmd/containerd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ import (
_ "github.com/containerd/containerd/runtime/v2"
_ "github.com/containerd/containerd/runtime/v2/runc/options"

// CRI
_ "github.com/containerd/cri"

// Register fc-control plugin
_ "github.com/firecracker-microvm/firecracker-containerd/firecracker-control"
)
Expand Down
83 changes: 73 additions & 10 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@ module github.com/firecracker-microvm/firecracker-containerd

require (
github.com/Microsoft/go-winio v0.4.14 // indirect
github.com/Microsoft/hcsshim v0.8.1 // indirect
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
github.com/containerd/cgroups v0.0.0-20181105182409-82cb49fc1779 // indirect
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 // indirect
github.com/containerd/containerd v1.3.0-beta.2
github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac
github.com/containerd/cri v1.11.1-0.20190814194657-f1d492b0cdd1
github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c
github.com/containerd/go-cni v0.0.0-20190822145629-0d360c50b10b // indirect
github.com/containerd/go-runc v0.0.0-20190226155025-7d11b49dc076 // indirect
github.com/containerd/ttrpc v0.0.0-20190613183316-1fb3814edf44
github.com/containerd/typeurl v0.0.0-20181015155603-461401dc8f19
github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20
github.com/containernetworking/plugins v0.8.2 // indirect
github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v1.4.2-0.20171019062838-86f080cff091 // indirect
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad // indirect
github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
github.com/docker/go-units v0.3.3
Expand All @@ -23,29 +26,89 @@ require (
github.com/gofrs/uuid v3.2.0+incompatible
github.com/gogo/googleapis v1.1.0 // indirect
github.com/gogo/protobuf v1.2.1
github.com/golang/protobuf v1.2.0
github.com/golang/protobuf v1.3.1
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/hashicorp/go-multierror v1.0.0
github.com/mdlayher/vsock v0.0.0-20190329173812-a92c53d5dcab
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.0-rc8
github.com/opencontainers/runtime-spec v0.1.2-0.20181106065543-31e0d16c1cb7
github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559
github.com/opencontainers/selinux v1.3.0 // indirect
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.2 // indirect
github.com/seccomp/libseccomp-golang v0.9.1 // indirect
github.com/shirou/gopsutil v2.18.12+incompatible
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
github.com/sirupsen/logrus v1.4.1
github.com/stretchr/testify v1.2.2
github.com/stretchr/testify v1.3.0
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
github.com/tchap/go-patricia v2.3.0+incompatible // indirect
github.com/urfave/cli v1.20.0 // indirect
go.etcd.io/bbolt v1.3.1-etcd.8
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
google.golang.org/genproto v0.0.0-20181109154231-b5d43981345b // indirect
google.golang.org/grpc v1.21.0
gotest.tools v2.2.0+incompatible // indirect
k8s.io/klog v0.4.0 // indirect
k8s.io/kubernetes v1.15.3 // indirect
k8s.io/utils v0.0.0-20190829053155-3a4a5477acf8 // indirect
)

// Workaround for github.com/containerd/containerd issue #3031
// Workaround for https://github.com/containerd/containerd/issues/3031
replace github.com/docker/distribution v2.7.1+incompatible => github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible

// Workaround for logrus rename
// https://github.com/sirupsen/logrus/issues/570#issuecomment-313933276
replace github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.0.5

// Workaround for https://github.com/kubernetes/kubernetes/issues/79384
// Please update the below dependencies by update-cri-gomod.sh

replace k8s.io/api => k8s.io/api v0.0.0-20190620084959-7cf5895f2711
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to make sure I'm understanding correctly, we need these replace directives because they are indirect dependencies and we thus can't specify specific versions in our go.mod? Kind of unfortunate if so and seems like a major deficiency in go modules, but if there's no better way than it is what it is.

May be worth including a comment in the go.mod file explaining this and that they come from the update-gomod.sh script

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reality is a bit sad than that. We cannot even build our binaries without having a bunch of replace directives due to kubernetes/kubernetes#79384.

From the issue above;

k8s.io/kubernetes is not primarily intended to be consumed as a module. Only the published subcomponents are (and go get works properly with those).

Ideally speaking, the CRI plugin should depend on the published subcomponents, but it may not be possible right now. I haven't looked how hard it would be though.


replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190620085554-14e95df34f1f

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719

replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190620085212-47dc9a115b18

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190620085706-2090e6d8f84c

replace k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190620090043-8301c0bda1f0

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190620090013-c9a0fc045dc1

replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b

replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190620085130-185d68e6e6ea

replace k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190531030430-6117653b35f1

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190620090116-299a7b270edc

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190620085325-f29e2b4a4f84

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190620085942-b7f18460b210

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190620085809-589f994ddf7f

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190620085912-4acac5405ec6

replace k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190602132728-7075c07e78bf

replace k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190620085838-f1cb295a73c9

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190620090156-2138f2c9de18

replace k8s.io/metrics => k8s.io/metrics v0.0.0-20190620085625-3b22d835f165

replace k8s.io/node-api => k8s.io/node-api v0.0.0-20190620090231-de81913bee0f

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190620085408-1aef9010884e

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190620085735-97320335c8c8

replace k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190620085445-e8a5bf14f039

Loading