github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-02 01:16:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9828 from stevenhorsman/image-rs-bump-bad84c7

Browse Source 
Image rs bump to latest main
This commit is contained in:
Steve Horsman
2024-07-08 17:07:59 +01:00
committed by GitHub
parent 67ba0ad0ad 1d6c1d1621
commit e8836fafaa
3 changed files with 381 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

616
src/agent/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

3
src/agent/Cargo.toml
View File

@@ -81,7 +81,8 @@ strum = "0.26.2"
strum_macros = "0.26.2"
# Image pull/decrypt
image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "ca6b438", default-features = true, optional = true }
# Note: this is the last commit before an issue with whiteout causes problems with some tests
image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "53c2b7dae453daf6cba238b4817e95e703d6a519", default-features = true, optional = true }
openssl = { version = "0.10.54", features = ["vendored"], optional = true }
# Agent Policy

12
tests/integration/kubernetes/k8s-liveness-probes.bats
View File

@@ -5,6 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
load "${BATS_TEST_DIRNAME}/lib.sh"
load "${BATS_TEST_DIRNAME}/../../common.bash"
load "${BATS_TEST_DIRNAME}/tests_common.sh"
@@ -13,6 +14,7 @@ setup() {
agnhost_name="${container_images_agnhost_name}"
agnhost_version="${container_images_agnhost_version}"
setup_common
get_pod_config_dir
}
@@ -21,6 +23,7 @@ setup() {
yaml_file="${pod_config_dir}/probe-pod-liveness.yaml"
cp "${pod_config_dir}/pod-liveness.yaml" "${yaml_file}"
set_node "${yaml_file}" "$node"
add_allow_all_policy_to_yaml "${yaml_file}"
# Create pod
@@ -45,7 +48,7 @@ setup() {
sed -e "s#\${agnhost_image}#${agnhost_name}:${agnhost_version}#" \
"${pod_config_dir}/pod-http-liveness.yaml" > "${yaml_file}"
set_node "${yaml_file}" "$node"
add_allow_all_policy_to_yaml "${yaml_file}"
# Create pod
@@ -71,7 +74,7 @@ setup() {
sed -e "s#\${agnhost_image}#${agnhost_name}:${agnhost_version}#" \
"${pod_config_dir}/pod-tcp-liveness.yaml" > "${yaml_file}"
set_node "${yaml_file}" "$node"
add_allow_all_policy_to_yaml "${yaml_file}"
# Create pod
@@ -95,4 +98,9 @@ teardown() {
kubectl delete pod "$pod_name"
rm -f "${yaml_file}"
if [[ -n "${node_start_time}:-}" && -z "$BATS_TEST_COMPLETED" ]]; then
echo "DEBUG: system logs of node '$node' since test start time ($node_start_time)"
print_node_journal "$node" "kata" --since "$node_start_time" || true
fi
}