github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-17 17:02:42 +00:00
Code Issues Projects Releases Wiki Activity

rootfs: Bump rootfs-{image,initrd} to 24.04

Browse Source 
Since #11197 was merged, all confidential k8s e2e tests for s390x
have been failing with the following errors:

```
attestation-agent: error while loading shared libraries:
libcurl.so.4: cannot open shared object file
libnghttp2.so.14: cannot open shared object file
```

In line with the update on x86_64, we need to upgrade the OS used
in rootfs-{image,initrd} on s390x.
This commit also bumps all 22.04 to 24.04 for all architectures.
For s390x, this ensures the missing packages listed above are
installed.

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi 2025-06-17 20:02:54 +02:00
parent fd93e83a4f
commit 4be261f248
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/osbuilder/rootfs-builder/ubuntu/config.sh
View File

@ -12,6 +12,7 @@ PACKAGES="chrony iptables dbus"
[ "$AGENT_INIT" = no ] && PACKAGES+=" init" [ "$AGENT_INIT" = no ] && PACKAGES+=" init"
[ "$MEASURED_ROOTFS" = yes ] && PACKAGES+=" cryptsetup-bin e2fsprogs" [ "$MEASURED_ROOTFS" = yes ] && PACKAGES+=" cryptsetup-bin e2fsprogs"
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2" [ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2"
[ "$(uname -m)" = "s390x" ] && PACKAGES+=" libcurl4 libnghttp2-14"
REPO_COMPONENTS=${REPO_COMPONENTS:-main} REPO_COMPONENTS=${REPO_COMPONENTS:-main}
case "$ARCH" in case "$ARCH" in

32
versions.yaml
View File

@ -122,25 +122,25 @@ assets:
architecture: architecture:
aarch64: aarch64:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
nvidia-gpu: nvidia-gpu:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
nvidia-gpu-confidential: nvidia-gpu-confidential:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
ppc64le: ppc64le:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
s390x: s390x:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
confidential: confidential:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
x86_64: x86_64:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 lTS version: "noble" # 24.04 LTS
confidential: confidential:
name: "ubuntu" name: "ubuntu"
version: "noble" # 24.04 LTS version: "noble" # 24.04 LTS
@ -149,10 +149,10 @@ assets:
version: "3.0" version: "3.0"
nvidia-gpu: nvidia-gpu:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
nvidia-gpu-confidential: nvidia-gpu-confidential:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
initrd: initrd:
description: | description: |
@ -165,21 +165,21 @@ assets:
version: "3.18" version: "3.18"
nvidia-gpu: nvidia-gpu:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
nvidia-gpu-confidential: nvidia-gpu-confidential:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
# Do not use Alpine on ppc64le & s390x, the agent cannot use musl because # Do not use Alpine on ppc64le & s390x, the agent cannot use musl because
# there is no such Rust target # there is no such Rust target
ppc64le: ppc64le:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
s390x: s390x:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
confidential: confidential:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
x86_64: x86_64:
name: "alpine" name: "alpine"
version: "3.18" version: "3.18"
@ -188,10 +188,10 @@ assets:
version: "noble" # 24.04 LTS version: "noble" # 24.04 LTS
nvidia-gpu: nvidia-gpu:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
nvidia-gpu-confidential: nvidia-gpu-confidential:
name: "ubuntu" name: "ubuntu"
version: "jammy" # 22.04 LTS version: "noble" # 24.04 LTS
kernel: kernel:
description: "Linux kernel optimised for virtual machines" description: "Linux kernel optimised for virtual machines"