OCI hook improvements

OCI-hook/hookscript.template

@@ -6,14 +6,20 @@ set -x
 
 PROC_DIR="${PROC_DIR:-/proc}"
 
+STATE=$(cat)
+
 CG_PATH=$(jq -er '.linux.cgroupsPath' < config.json)
 if [[ ! "$CG_PATH" =~ .*"burst".* ]]; then
   exit 0
 fi
 
-PID=$(jq -er '.pid' < status)
-CONTAINERID=$(jq -er '.linux.cgroupsPath | split(":")[2]' < config.json)
-rc=$({{ .RuntimeCmd }})
+PID=$(echo "$STATE" | jq -er '.pid')
+if [ -z "$PID" ]; then
+  exit 0
+fi
+CONTAINERID=$(echo "$STATE" | jq -er '.id')
+{{ .RuntimeCmd }}
+rc=$?
 if [ "$rc" -eq 0 ]; then
   exit 0
 fi

OCI-hook/testData/bin/crun-fail/crun

@@ -1,3 +1,2 @@
 #!/usr/bin/bash
-echo "1"
 exit 1

OCI-hook/testData/bin/crun-success/crun

@@ -1,3 +1,2 @@
 #!/usr/bin/bash
-echo "0"
 exit 0

OCI-hook/testData/run-tests.sh

@@ -55,10 +55,17 @@ for scenario_dir in "${SCENARIOS_DIR}"/*/; do
     echo "--- ${scenario}"
     echo "    crun: ${use_crun}, expected exit: ${expected_exit_code}, PROC_DIR: ${proc_dir}"
 
+    state_file="${scenario_dir}/state.json"
+    if [ -f "${state_file}" ]; then
+        state_input="${state_file}"
+    else
+        state_input="/dev/null"
+    fi
+
     set +e
     (
         cd "${scenario_dir}"
-        PATH="${crun_bin_dir}:${PATH}" PROC_DIR="${proc_dir}" "${RENDERED_SCRIPT}"
+        PATH="${crun_bin_dir}:${PATH}" PROC_DIR="${proc_dir}" "${RENDERED_SCRIPT}" < "${state_input}"
     ) > /dev/null 2>&1
     actual_exit_code=$?
     set -e

OCI-hook/testData/scenarios/01-non-burstable/state.json

@@ -0,0 +1 @@
+{"ociVersion":"1.0","id":"container123","pid":12345,"root":"/var/lib/containers/rootfs","bundle":"/run/containers/bundle","status":"running"}

OCI-hook/testData/scenarios/02-burstable-crun-success/state.json

@@ -0,0 +1 @@
+{"ociVersion":"1.0","id":"container456","pid":12345,"root":"/var/lib/containers/rootfs","bundle":"/run/containers/bundle","status":"running"}

OCI-hook/testData/scenarios/03-burstable-crun-fail-process-gone/state.json

@@ -0,0 +1 @@
+{"ociVersion":"1.0","id":"container789","pid":99999,"root":"/var/lib/containers/rootfs","bundle":"/run/containers/bundle","status":"running"}

OCI-hook/testData/scenarios/04-burstable-crun-fail-zombie/state.json

@@ -0,0 +1 @@
+{"ociVersion":"1.0","id":"container321","pid":12345,"root":"/var/lib/containers/rootfs","bundle":"/run/containers/bundle","status":"running"}

OCI-hook/testData/scenarios/05-burstable-crun-fail-alive/state.json

@@ -0,0 +1 @@
+{"ociVersion":"1.0","id":"container654","pid":12345,"root":"/var/lib/containers/rootfs","bundle":"/run/containers/bundle","status":"running"}

OCI-hook/testData/scenarios/06-burstable-no-status-file/config.json

@@ -0,0 +1,5 @@
+{
+  "linux": {
+    "cgroupsPath": "kubepods:burstable:container999"
+  }
+}

OCI-hook/testData/scenarios/06-burstable-no-status-file/expected_exit_code

@@ -0,0 +1 @@
+0

OCI-hook/testData/scenarios/06-burstable-no-status-file/use_crun

@@ -0,0 +1 @@
+success

pkg/wasp/oci-hook-render/render.go

@@ -33,9 +33,9 @@ func (r *Renderer) Render() error {
 
 	switch r.runtimeCmd {
 	case RuncBinary:
-		data.RuntimeCmd = fmt.Sprintf("%s update \"$CONTAINERID\" --memory-swap -1\n", RuncBinary)
+		data.RuntimeCmd = fmt.Sprintf("%s update \"$CONTAINERID\" --memory-swap -1", RuncBinary)
 	case CrunBinary:
-		data.RuntimeCmd = fmt.Sprintf("%s update --memory-swap=-1 \"$CONTAINERID\"\n", CrunBinary)
+		data.RuntimeCmd = fmt.Sprintf("%s update --memory-swap=-1 \"$CONTAINERID\"", CrunBinary)
 	default:
 		return fmt.Errorf("unsupported OCI runtime %s", r.runtimeCmd)
 	}