github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Use sandboxed CRI by default

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko
2023-08-21 10:52:20 -07:00
parent 55c877297a
commit c3f3cad287
9 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
script/test/cri-integration.sh
View File

@@ -44,9 +44,9 @@ test_setup "${REPORT_DIR}"
CMD=""
if [ -n "${sudo}" ]; then
CMD+="${sudo} "
# sudo strips environment variables, so add ENABLE_CRI_SANDBOXES back if present
if [ -n "${ENABLE_CRI_SANDBOXES}" ]; then
CMD+="ENABLE_CRI_SANDBOXES='${ENABLE_CRI_SANDBOXES}' "
# sudo strips environment variables, so add DISABLE_CRI_SANDBOXES back if present
if [ -n "${DISABLE_CRI_SANDBOXES}" ]; then
CMD+="DISABLE_CRI_SANDBOXES='${DISABLE_CRI_SANDBOXES}' "
fi
fi
CMD+="${PWD}/bin/cri-integration.test"

6
script/test/utils.sh
View File

@@ -215,9 +215,9 @@ run_containerd() {
CMD=""
if [ -n "${sudo}" ]; then
CMD+="${sudo} "
# sudo strips environment variables, so add ENABLE_CRI_SANDBOXES back if present
if [ -n "${ENABLE_CRI_SANDBOXES}" ]; then
CMD+="ENABLE_CRI_SANDBOXES='${ENABLE_CRI_SANDBOXES}' "
# sudo strips environment variables, so add DISABLE_CRI_SANDBOXES back if present
if [ -n "${DISABLE_CRI_SANDBOXES}" ]; then
CMD+="DISABLE_CRI_SANDBOXES='${DISABLE_CRI_SANDBOXES}' "
fi
fi
CMD+="${PWD}/bin/containerd"