github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-27 19:35:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10803 from ryansavino/update-confidential-initrd-22.04

Browse Source 
versions: update confidential initrd to 22.04
This commit is contained in:
Zvonko Kaiser 2025-02-27 09:29:36 -05:00 committed by GitHub
commit 33460386b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integration/kubernetes/k8s-guest-pull-image.bats
View File

@ -90,6 +90,7 @@ setup() {
@test "Test we can pull an image inside the guest using trusted storage" {
[ "$(uname -m)" == "s390x" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
[ "${KATA_HYPERVISOR}" == "qemu-snp" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
# The image pulled in the guest will be downloaded and unpacked in the `/run/kata-containers/image` directory.
# The tests will use `cryptsetup` to encrypt a block device and mount it at `/run/kata-containers/image`.
@ -138,6 +139,7 @@ setup() {
@test "Test we cannot pull a large image that pull time exceeds createcontainer timeout inside the guest" {
[ "$(uname -m)" == "s390x" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
[ "${KATA_HYPERVISOR}" == "qemu-snp" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
storage_config=$(mktemp "${BATS_FILE_TMPDIR}/$(basename "${storage_config_template}").XXX")
local_device=$(create_loop_device)
@ -181,6 +183,7 @@ setup() {
@test "Test we can pull a large image inside the guest with large createcontainer timeout" {
[ "$(uname -m)" == "s390x" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
[ "${KATA_HYPERVISOR}" == "qemu-snp" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
if [ "${KATA_HYPERVISOR}" = "qemu-coco-dev" ] && [ "${KBS_INGRESS}" = "aks" ]; then
skip "skip this specific one due to issue https://github.com/kata-containers/kata-containers/issues/10299"

11
tools/osbuilder/initrd-builder/initrd_builder.sh
View File

@ -74,7 +74,16 @@ OK "Agent is installed"
# initramfs expects /init, create symlink only if ${ROOTFS}/init does not exist
# Init may be provided by other packages, e.g. systemd or GPU initrd/rootfs
[ -x "${ROOTFS}/init" ] || [ -L "${ROOTFS}/init" ] || sudo ln -sf /sbin/init "${ROOTFS}/init"
if [ ! -x "${ROOTFS}/init" ] && [ ! -L "${ROOTFS}/init" ]; then
# ATTN: In some instances, /init is not following two or more levels of symlinks
# i.e. (/init to /sbin/init to /lib/systemd/systemd)
# Setting /init directly to /lib/systemd/systemd when AGENT_INIT is disabled
if [ "${AGENT_INIT}" = "yes" ]; then
sudo ln -sf /sbin/init "${ROOTFS}/init"
else
sudo ln -sf /lib/systemd/systemd "${ROOTFS}/init"
fi
fi
info "Creating ${IMAGE_DIR}/${IMAGE_NAME} based on rootfs at ${ROOTFS}"
( cd "${ROOTFS}" && sudo find . | sudo cpio -H newc -o | gzip -9 ) > "${IMAGE_DIR}"/"${IMAGE_NAME}"

6
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -472,11 +472,7 @@ install_initrd() {
#Install guest initrd for confidential guests
install_initrd_confidential() {
if [ "${ARCH}" == "s390x" ]; then
export MEASURED_ROOTFS=no
else
export MEASURED_ROOTFS=yes
fi
export MEASURED_ROOTFS=no
export PULL_TYPE=default
install_initrd "confidential"
}

4
versions.yaml
View File

@ -168,7 +168,7 @@ assets:
version: "jammy" # 22.04 LTS
nvidia-gpu-confidential:
name: "ubuntu"
version: "jammy"
version: "jammy" # 22.04 LTS
# Do not use Alpine on ppc64le & s390x, the agent cannot use musl because
# there is no such Rust target
ppc64le:
@ -185,7 +185,7 @@ assets:
version: "3.18"
confidential:
name: "ubuntu"
version: "focal" # 20.04 LTS
version: "jammy" # 22.04 LTS
nvidia-gpu:
name: "ubuntu"
version: "jammy" # 22.04 LTS