Skip to content

[pull] main from containerd:main #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Jul 31, 2026
Merged

[pull] main from containerd:main #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f418688
integration: build the whiteout-test image locally
AkihiroSuda Jul 8, 2026
91be73b
cri: remove restore in CreateContainer
samuelkarp Jul 28, 2026
2600710
Merge pull request #13735 from AkihiroSuda/whiteout-test
fuweid Jul 31, 2026
56bc534
Merge pull request #13871 from samuelkarp/remove_deprecated_checkpoin…
samuelkarp Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,23 +555,6 @@ jobs:
env
sudo -E PATH=$PATH ./script/critest.sh "${{github.workspace}}/report"

- name: Install tools
# The GitHub Actions image already has buildah and podman included. Not the
# ubuntu-24.04-arm images. buildah and podman is needed to convert the
# Kubernetes checkpoint archive to an OCI image.
# See contrib/checkpoint/checkpoint-restore-cri-test.sh
if: matrix.os == 'ubuntu-24.04-arm'
run: sudo apt-get install -y buildah podman

- if: matrix.os != 'ubuntu-24.04-arm'
name: Checkpoint/Restore via CRI
env:
TEST_RUNTIME: ${{ matrix.runtime }}
CGROUP_DRIVER: ${{ matrix.cgroup_driver }}
run: |
env
sudo -E PATH=$PATH ./contrib/checkpoint/checkpoint-restore-cri-test.sh

- if: matrix.os != 'ubuntu-24.04-arm'
name: Checkpoint/Restore Disable via CRI
env:
Expand Down
2 changes: 1 addition & 1 deletion RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ The deprecated features are shown in the following table:
| Go-Plugin library (`*.so`) as containerd runtime plugin | containerd v2.0 | containerd v2.1 ✅ | Use external plugins (proxy or binary) |
| NRI v0.1.0 plugin support | containerd v2.2 | containerd v2.3 | Use the v010-adapter NRI plugin, or update v0.1.0 plugins to use the current NRI API |
| cgroup v1 support | containerd v2.2 | (May 2029) | Use cgroup v2 |
| Restoring checkpoint data during CRI `CreateContainer` | containerd v2.3 | containerd v2.4 | Follow [KEP-5823](https://github.com/kubernetes/enhancements/issues/5823) for a replacement `RestorePod` API |
| Restoring checkpoint data during CRI `CreateContainer` | containerd v2.3 | containerd v2.4 ✅ | Follow [KEP-5823](https://github.com/kubernetes/enhancements/issues/5823) for a replacement `RestorePod` API |

- Pulling Schema 1 images has been disabled in containerd v2.0, but it still can be enabled by setting an environment variable `CONTAINERD_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1`
until containerd v2.1. `ctr` users have to specify `--local` too (e.g., `ctr images pull --local`). Users of CRI clients (such as Kubernetes and `crictl`) have to specify this environment variable on the containerd daemon (usually in the systemd unit).
Expand Down
68 changes: 7 additions & 61 deletions contrib/checkpoint/checkpoint-restore-cri-disable-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,87 +201,33 @@ fi
echo "PASS: Test 1: Checkpoint fails fast and source container remains running"
cleanup_container "$pod_id" "$ctr_id"

# Test 2: Restore fails fast when enable_criu = false.
POD_JSON=$(mktemp)
jq ".log_directory=\"${TESTDIR}\"" "$TESTDATA"/sandbox_config.json >"$POD_JSON"
pod_id=$(crictl runp "$POD_JSON")
touch "$TESTDIR/dummy-checkpoint.tar"
RESTORE_JSON=$(mktemp)
jq ".image.image=\"$TESTDIR/dummy-checkpoint.tar\"" "$TESTDATA"/container_sleep.json >"$RESTORE_JSON"
set +e
output=$(crictl create "$pod_id" "$RESTORE_JSON" "$POD_JSON" 2>&1)
exit_code=$?
set -e
rm -f "$RESTORE_JSON" "$POD_JSON"
if [ $exit_code -eq 0 ] || [[ ! "$output" =~ "criu support is disabled by configuration" ]]; then
echo "ERROR: Test 2 failed (restore did not fail fast). Output: $output"
exit 1
fi
echo "PASS: Test 2: Restore fails fast when enable_criu = false"
crictl rmp -f "$pod_id" >/dev/null 2>&1 || true

stop_containerd

# ==============================================================================
# Group 2 (Configuration: enable_criu = true, normal PATH)
# ==============================================================================
start_containerd "true" ""

# Test 3: Normal checkpoint and restore preserves container state.
ids=$(setup_container)
pod_id=$(echo "$ids" | cut -d: -f1)
ctr_id=$(echo "$ids" | cut -d: -f2)
crictl exec "$ctr_id" touch /root/state_file
rm -f "$TESTDIR"/state_checkpoint.tar
crictl checkpoint --export="$TESTDIR"/state_checkpoint.tar "${ctr_id}"
cleanup_container "$pod_id" "$ctr_id"

POD_JSON=$(mktemp)
jq ".log_directory=\"${TESTDIR}\"" "$TESTDATA"/sandbox_config.json >"$POD_JSON"
pod_id=$(crictl runp "$POD_JSON")
RESTORE_JSON=$(mktemp)
jq ".image.image=\"$TESTDIR/state_checkpoint.tar\"" "$TESTDATA"/container_sleep.json >"$RESTORE_JSON"
restored_ctr_id=$(crictl create "$pod_id" "$RESTORE_JSON" "$POD_JSON")
rm -f "$RESTORE_JSON" "$POD_JSON"
crictl start "$restored_ctr_id"
set +e
crictl exec "$restored_ctr_id" ls /root/state_file >/dev/null 2>&1
exit_code=$?
set -e
if [ $exit_code -ne 0 ]; then
echo "ERROR: Test 3 failed (state_file not found in restored container)."
exit 1
fi
echo "PASS: Test 3: Normal checkpoint and restore preserves container state"
cleanup_container "$pod_id" "$restored_ctr_id"

stop_containerd

# ==============================================================================
# Group 3 (Configuration: enable_criu omitted/defaults, normal PATH)
# Group 2 (Configuration: enable_criu omitted/defaults, normal PATH)
# ==============================================================================
start_containerd "omit" ""

# Test 4: enable_criu omitted from configuration defaults to true (allowing checkpoint/restore).
# Test 2: enable_criu omitted from configuration defaults to true (allowing checkpoint).
ids=$(setup_container)
pod_id=$(echo "$ids" | cut -d: -f1)
ctr_id=$(echo "$ids" | cut -d: -f2)
rm -f "$TESTDIR"/omitted_checkpoint.tar
crictl checkpoint --export="$TESTDIR"/omitted_checkpoint.tar "${ctr_id}"
echo "PASS: Test 4: enable_criu omitted from configuration defaults to true"
echo "PASS: Test 2: enable_criu omitted from configuration defaults to true"
cleanup_container "$pod_id" "$ctr_id"

stop_containerd

# ==============================================================================
# Group 4 (Configuration: enable_criu = true, cleaned PATH without CRIU)
# Group 3 (Configuration: enable_criu = true, cleaned PATH without CRIU)
# ==============================================================================
if [ -n "${CRIU_DIR}" ]; then
CLEANED_PATH=$(get_cleaned_path)

start_containerd "true" "${CLEANED_PATH}"

# Test 5: CRIU missing from PATH, enable_criu = true.
# Test 3: CRIU missing from PATH, enable_criu = true.
# Verifies that when CRIU is enabled but missing, it fails with the binary missing error.
ids=$(setup_container)
pod_id=$(echo "$ids" | cut -d: -f1)
Expand All @@ -291,10 +237,10 @@ if [ -n "${CRIU_DIR}" ]; then
exit_code=$?
set -e
if [ $exit_code -eq 0 ] || [[ ! "$output" =~ "criu binary not found" ]]; then
echo "ERROR: Test 5 failed. Output: $output"
echo "ERROR: Test 3 failed. Output: $output"
exit 1
fi
echo "PASS: Test 5: Fails with binary not found as expected when enable_criu = true"
echo "PASS: Test 3: Fails with binary not found as expected when enable_criu = true"
cleanup_container "$pod_id" "$ctr_id"

stop_containerd
Expand Down
Loading
Loading