Bump gVisor to 20230214.0

* Bump gVisor containerd shim and runsc to 20230214.0 release. * Bump gvisor-containerd version to 1.6.18. Closes vhive-serverless#683 Signed-off-by: Georgiy Lebedev <lebedev.gk@phystech.edu>
CuriousGeorgiy · Mar 1, 2023 · cc451ac · cc451ac
1 parent 2d01449
commit cc451ac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 ## v1.6
 [@davidbuzatu-marian](https://github.com/DavidBuzatu-Marian)
 ### Added
+- Bumped gVisor to 20230214.0.
 - Added support for [eStargz](https://github.com/containerd/stargz-snapshotter) in stock-only setup.
 - Added [setup script](./scripts/stargz/setup_stargz.sh) for stargz-snapshotter.
 - Added [example](./configs/knative_workloads/stargz-node.yaml) knative deployment for eStargz.

diff --git a/bin/containerd-shim-runsc-v1 b/bin/containerd-shim-runsc-v1
diff --git a/bin/gvisor-containerd b/bin/gvisor-containerd
diff --git a/configs/gvisor-containerd/config.toml b/configs/gvisor-containerd/config.toml
@@ -5,6 +5,8 @@ state = "/run/gvisor-containerd"
   address = "/run/gvisor-containerd/containerd.sock"
 [plugins."io.containerd.runtime.v1.linux"]
   shim_debug = true
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+  runtime_type = "io.containerd.runc.v2"
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runsc]
   runtime_type = "io.containerd.runsc.v1"
 

diff --git a/scripts/install_stock.sh b/scripts/install_stock.sh
@@ -37,7 +37,7 @@ wget --continue --quiet https://github.com/opencontainers/runc/releases/download
 mv runc.amd64 runc
 sudo install -D -m0755 runc /usr/local/sbin/runc
 
-wget --continue --quiet https://storage.googleapis.com/gvisor/releases/release/20210622/x86_64/runsc 
+wget --continue --quiet https://storage.googleapis.com/gvisor/releases/release/20230214/x86_64/runsc
 sudo chmod a+rx runsc
 sudo mv runsc /usr/local/bin