From cb6da655dbc90d473d7f28111e4962e4934f179f Mon Sep 17 00:00:00 2001 From: Pris Nasrat Date: Wed, 27 Mar 2024 09:01:14 -0400 Subject: [PATCH] Fix snapshotting example build Updates go mod for 1.21, tc-redirect-tap, and cni plugins Removes deleted dependency github.com/mitchellh/osext Signed-off-by: Pris Nasrat --- examples/cmd/snapshotting/.gitignore | 4 +++- examples/cmd/snapshotting/Makefile | 6 +++--- examples/cmd/snapshotting/go.mod | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/cmd/snapshotting/.gitignore b/examples/cmd/snapshotting/.gitignore index d855be89..87db3613 100644 --- a/examples/cmd/snapshotting/.gitignore +++ b/examples/cmd/snapshotting/.gitignore @@ -1,2 +1,4 @@ bin/ - +root-drive-* +root-drive-with-ssh.img +snapshot-example diff --git a/examples/cmd/snapshotting/Makefile b/examples/cmd/snapshotting/Makefile index 203e8650..ce8134db 100644 --- a/examples/cmd/snapshotting/Makefile +++ b/examples/cmd/snapshotting/Makefile @@ -44,13 +44,13 @@ bin: mkdir -p bin bin/tc-redirect-tap: bin - $(call install_go,github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap,v0.0.0-20220715050423-f2af44521093) + $(call install_go,github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap,v0.0.0-20240321155514-f4bce16532c3) bin/ptp: bin - $(call install_go,github.com/containernetworking/plugins/plugins/main/ptp,v1.1.1) + $(call install_go,github.com/containernetworking/plugins/plugins/main/ptp,v1.4.1) bin/host-local: bin - $(call install_go,github.com/containernetworking/plugins/plugins/ipam/host-local,v1.1.1) + $(call install_go,github.com/containernetworking/plugins/plugins/ipam/host-local,v1.4.1) vmlinux: $(curl) -o vmlinux https://s3.amazonaws.com/spec.ccfc.min/img/quickstart_guide/${ARCH}/kernels/vmlinux.bin diff --git a/examples/cmd/snapshotting/go.mod b/examples/cmd/snapshotting/go.mod index 00beaab7..40617501 100644 --- a/examples/cmd/snapshotting/go.mod +++ b/examples/cmd/snapshotting/go.mod @@ -1,6 +1,6 @@ module main -go 1.18 +go 1.21 require ( github.com/firecracker-microvm/firecracker-go-sdk v1.0.0 @@ -11,8 +11,8 @@ require ( require ( github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect github.com/containerd/fifo v1.0.0 // indirect - github.com/containernetworking/cni v1.1.2 // indirect - github.com/containernetworking/plugins v1.1.1 // indirect + github.com/containernetworking/cni v1.4.1 // indirect + github.com/containernetworking/plugins v1.4.1 // indirect github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/errors v0.20.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect