From 859237b189fdc3329726e78082dc76a9071f57ff Mon Sep 17 00:00:00 2001 From: Syed Ahsan Date: Tue, 8 Oct 2019 11:05:21 -0700 Subject: [PATCH] Setting the RUNNER to use crio (#208) This change helps with setting up the RUNNER to use crio by default instead of using containerd. If the user wants to use containerd, they need to specify when running the setup_system script. Signed-off: Syed Ahsan --- clr-k8s-examples/README.md | 4 +++- clr-k8s-examples/setup_system.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/clr-k8s-examples/README.md b/clr-k8s-examples/README.md index 0fb5347..335243d 100644 --- a/clr-k8s-examples/README.md +++ b/clr-k8s-examples/README.md @@ -34,7 +34,9 @@ This script ensures the following * Customizes the system to ensure correct defaults are setup (IP Forwarding, Swap off,...) * Ensures all the dependencies are loaded on boot (kernel modules) -> NOTE: This step is done automatically if using vagrant. +> NOTE: This step is done automatically if using vagrant. The [`setup_system.sh`](setup_system.sh) +script uses the runtime specified in the `RUNNER` environment variable and defaults to `crio`. To use the +`containerd` runtime, set the `RUNNER` environment variable to `containerd`. ### Configuration for high numbers of pods per node diff --git a/clr-k8s-examples/setup_system.sh b/clr-k8s-examples/setup_system.sh index fcaf2a7..c5b79ff 100755 --- a/clr-k8s-examples/setup_system.sh +++ b/clr-k8s-examples/setup_system.sh @@ -10,7 +10,7 @@ HIGH_POD_COUNT=${HIGH_POD_COUNT:-""} # set no proxy ADD_NO_PROXY="10.244.0.0/16,10.96.0.0/12" ADD_NO_PROXY+=",$(hostname -I | sed 's/[[:space:]]/,/g')" -: "${RUNNER:=containerd}" +: "${RUNNER:=crio}" # update os version function upate_os_version() {