Skip to content

kubernetes: fix fail-cgroup-v1 serialization #109

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

Closed
ytsssun wants to merge 2 commits into from
+43 −4
Closed

kubernetes: fix fail-cgroup-v1 serialization #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f4195c
fix: add skip_serializing_if to fail_cgroup_v1
ytsssun Jan 7, 2026
f0d63ea
chore: bump settings-models to 0.19.0
ytsssun Jan 7, 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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ settings-extension-ecs = { path = "./bottlerocket-settings-models/settings-exten
settings-extension-host-containers = { path = "./bottlerocket-settings-models/settings-extensions/host-containers", version = "0.2" }
settings-extension-image-verifier-plugins = { path = "./bottlerocket-settings-models/settings-extensions/image-verifier-plugins", version = "0.1" }
settings-extension-kernel = { path = "./bottlerocket-settings-models/settings-extensions/kernel", version = "0.1" }
settings-extension-kubernetes = { path = "./bottlerocket-settings-models/settings-extensions/kubernetes", version = "0.6" }
settings-extension-kubernetes = { path = "./bottlerocket-settings-models/settings-extensions/kubernetes", version = "0.8" }
settings-extension-kubelet-device-plugins = { path = "./bottlerocket-settings-models/settings-extensions/kubelet-device-plugins", version = "0.3" }
settings-extension-metrics = { path = "./bottlerocket-settings-models/settings-extensions/metrics", version = "0.1" }
settings-extension-motd = { path = "./bottlerocket-settings-models/settings-extensions/motd", version = "0.1" }
Expand Down
31 changes: 30 additions & 1 deletion bottlerocket-settings-models/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- See [unreleased changes here]

[unreleased changes here]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.17.0...HEAD
[unreleased changes here]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.19.0...HEAD

## [0.19.0] - 2026-01-07

## Model Changes

### Fixed

- Fixed `fail-cgroup-v1` kubernetes setting serialization to skip when None ([#109])

[#109]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/pull/109

[0.19.0]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.18.0...bottlerocket-settings-models-v0.19.0

## [0.18.0] - 2026-01-05

## Model Changes

### Added

- Added `fail-cgroup-v1` kubernetes setting ([#108])

### Changed

- Updated regex for `NvidiaGpuModel` validation ([#105])

[#105]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/pull/105
[#108]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/pull/108

[0.18.0]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.17.0...bottlerocket-settings-models-v0.18.0

## [0.17.0] - 2025-11-05

Expand Down
2 changes: 1 addition & 1 deletion bottlerocket-settings-models/settings-extensions/kubernetes/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "settings-extension-kubernetes"
version = "0.6.0"
version = "0.8.0"
authors = ["Sean P. Kelly <[email protected]>"]
license = "Apache-2.0 OR MIT"
edition = "2021"
Expand Down
10 changes: 10 additions & 0 deletions bottlerocket-settings-models/settings-extensions/kubernetes/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ pub struct KubernetesSettingsV1 {
hostname_override: ValidLinuxHostname,
ids_per_pod: KubernetesIdsPerPodValue,
max_parallel_image_pulls: i32,
#[serde(alias = "fail-cgroupv1", skip_serializing_if = "Option::is_none")]
fail_cgroup_v1: bool,
}

type Result<T> = std::result::Result<T, Infallible>;
Expand Down Expand Up @@ -207,6 +209,7 @@ mod test {
static_pods_enabled: None,
ids_per_pod: None,
max_parallel_image_pulls: None,
fail_cgroup_v1: None,
})
);
}
Expand All @@ -231,4 +234,11 @@ mod test {
}
);
}

#[test]
fn test_kubernetes_default_serialization() {
let k8s = KubernetesSettingsV1::default();
let serialized = serde_json::to_value(&k8s).expect("failed to serialize");
assert_eq!(serialized, serde_json::json!({}));
}
}
2 changes: 1 addition & 1 deletion bottlerocket-settings-models/settings-models/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bottlerocket-settings-models"
version = "0.17.0"
version = "0.19.0"
authors = ["Tom Kirchner <[email protected]>"]
license = "Apache-2.0 OR MIT"
edition = "2021"
Expand Down