github-featured/apple--container
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Update default kernel to Kata Containers 3.32.0 debug build (#2143)

Browse Source 
- Switch the default guest kernel from vmlinux-6.18.15-186
  (kata-static-3.28.0) to the newer version and variant
  vmlinux-6.18.35-197-debug (kata-static-3.32.0).
- The debug variant enables eBPF, kprobes, uprobes, ftrace
  and BTF (kata-containers/kata-containers#12567).

Signed-off-by: Agam Dua <agam_dua@apple.com>
This commit is contained in:
Agam Dua
2026-08-20 15:41:02 -07:00
committed by GitHub
parent 04324afe63
commit d6de569420
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/ContainerPersistence/ContainerSystemConfig.swift
+3 -3
View File
@@ -165,10 +165,10 @@ final public class VminitConfig: Codable, Sendable {
}
final public class KernelConfig: Codable, Sendable {
public static let defaultBinaryPath = "opt/kata/share/kata-containers/vmlinux-6.18.15-186"
public static let defaultBinaryPath = "opt/kata/share/kata-containers/vmlinux-6.18.35-197-debug"
public static let defaultURL: URL =
URL(string: "https://github.com/kata-containers/kata-containers/releases/download/3.28.0/kata-static-3.28.0-arm64.tar.zst")!
public static let defaultDigest = "sha256:f63d54507d1f18635d94475077e4c2330de4d8e05cedf25f7c38f063b0e66a91"
URL(string: "https://github.com/kata-containers/kata-containers/releases/download/3.32.0/kata-static-3.32.0-arm64.tar.zst")!
public static let defaultDigest = "sha256:8736c054d9223974735394f822000823baef509e1c33405ec798240fa9b6e4b5"
private enum CodingKeys: String, CodingKey {
case binaryPath
Tests/IntegrationTests/System/TestCLIKernelSetSerial.swift
+14 -11
View File
@@ -35,22 +35,25 @@ struct TestCLIKernelSetSerial {
/// Kernel release string parsed from the binary filename.
///
/// The binary path is conventionally `vmlinux-{release}` — but Kata's distribution
/// appends a `-{buildNumber}` suffix to the file (e.g. `vmlinux-6.18.15-186`)
/// while `uname -r` in the guest only reports the upstream release (`6.18.15`).
/// We strip a trailing `-N` where N is all digits to match what the guest reports,
/// while preserving non-numeric suffixes like `-rc1` or `-rt` that ARE part of the
/// upstream release string.
/// Kata names artifacts `vmlinux-{release}-{build}[-{variant}]` (e.g.
/// `vmlinux-6.18.35-197-debug`) while `uname -r` in the guest reports only the
/// release (`6.18.35`). We drop the first all-digit component after the release
/// and everything past it, preserving non-numeric components like `-rc1` or `-rt`
/// that ARE part of the upstream release string. A name with no build number is
/// returned unchanged.
private var expectedKernelRelease: String {
let filename = URL(fileURLWithPath: defaultBinaryPath).lastPathComponent
let prefix = "vmlinux-"
let raw = filename.hasPrefix(prefix) ? String(filename.dropFirst(prefix.count)) : filename
if let dashIdx = raw.lastIndex(of: "-"),
raw[raw.index(after: dashIdx)...].allSatisfy({ $0.isNumber })
{
return String(raw[..<dashIdx])
let components = raw.split(separator: "-", omittingEmptySubsequences: false)
guard
let buildIndex = components.dropFirst().firstIndex(where: {
!$0.isEmpty && $0.allSatisfy(\.isNumber)
})
else {
return raw
}
return raw
return components[..<buildIndex].joined(separator: "-")
}
// MARK: - Tests
docs/container-system-config.md
+6 -6
View File
@@ -31,9 +31,9 @@ memory = "1gb"
domain = "test"
[kernel]
binaryPath = "opt/kata/share/kata-containers/vmlinux-6.18.15-186"
url = "https://github.com/kata-containers/kata-containers/releases/download/3.28.0/kata-static-3.28.0-arm64.tar.zst"
digest = "sha256:f63d54507d1f18635d94475077e4c2330de4d8e05cedf25f7c38f063b0e66a91"
binaryPath = "opt/kata/share/kata-containers/vmlinux-6.18.35-197-debug"
url = "https://github.com/kata-containers/kata-containers/releases/download/3.32.0/kata-static-3.32.0-arm64.tar.zst"
digest = "sha256:8736c054d9223974735394f822000823baef509e1c33405ec798240fa9b6e4b5"
[network]
@@ -103,9 +103,9 @@ Guest kernel used when launching container VMs. Defaults change per release as k
| Key | Type | Default | Description |
|--------------|-----------|--------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------|
| `binaryPath` | `String` | `"opt/kata/share/kata-containers/vmlinux-6.18.15-186"` | Path **inside** the downloaded kernel archive that points to the kernel binary. |
| `url` | `URL` | `"https://github.com/kata-containers/kata-containers/releases/download/3.28.0/kata-static-3.28.0-arm64.tar.zst"` | Archive to download when no kernel is installed. Encoded and decoded as a plain string in TOML. |
| `digest` | `String` | `"sha256:f63d54507d1f18635d94475077e4c2330de4d8e05cedf25f7c38f063b0e66a91"` | Expected digest for the archive, for example `sha256:<hex>`. Required when configuring a custom `url`. |
| `binaryPath` | `String` | `"opt/kata/share/kata-containers/vmlinux-6.18.35-197-debug"` | Path **inside** the downloaded kernel archive that points to the kernel binary. |
| `url` | `URL` | `"https://github.com/kata-containers/kata-containers/releases/download/3.32.0/kata-static-3.32.0-arm64.tar.zst"` | Archive to download when no kernel is installed. Encoded and decoded as a plain string in TOML. |
| `digest` | `String` | `"sha256:8736c054d9223974735394f822000823baef509e1c33405ec798240fa9b6e4b5"` | Expected digest for the archive, for example `sha256:<hex>`. Required when configuring a custom `url`. |
## `[network]`