-
Notifications
You must be signed in to change notification settings - Fork 182
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.
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
Upgrade containerd to v1.7 #785
Conversation
b95e66e
to
0d8d85d
Compare
agent/ioproxy_handler.go
Outdated
"github.com/firecracker-microvm/firecracker-containerd/internal/vm" | ||
ioproxy "github.com/firecracker-microvm/firecracker-containerd/proto/service/ioproxy/ttrpc" | ||
"github.com/gogo/protobuf/types" | ||
"google.golang.org/protobuf/types/known/emptypb" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
containerd has defined a types package to make this migration easier. This should also help with any future migration.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated. @swagatbora90 PTAL
Signed-off-by: Henry Wang <henwang@amazon.com>
command: | ||
- make -C snapshotter integ-test FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_snapshotter | ||
timeout_in_minutes: 10 | ||
# - label: ":running: snapshotter isolated tests" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we intend to enable these tests in the future? Please cut a issue so that we can track it once this PR is merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably not. The snapshotter is no longer needed. But i just commented this block in case we'd like to revoke this decision later.
@@ -273,31 +273,31 @@ $(CNI_BIN_ROOT): | |||
|
|||
BRIDGE_BIN?=$(BINPATH)/bridge | |||
$(BRIDGE_BIN): | |||
GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/main/bridge | |||
GOBIN=$(dir $@) go install github.com/containernetworking/plugins/plugins/main/bridge@v1.1.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need to pin the version here. Can we not use @latest
? This will need separate update mechanism otherwise
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had to pin the plugins to some older versions to pass integ-tests, which still have the CNI configured for older versions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Besides CNI, there are some other packages such as git-validation
etc that have their versions pinned.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. For toolchain binaries, it's better to pin to a known good version otherwise upgrade may (surprisingly) break our build.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
Upgrade containerd to v1.7
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.