Skip to content

Commit 7fd63bd

Browse files
authored
Merge pull request #108 from ytsssun/fail-cgroup-v1-setting/settings-sdk
kubernetes: add fail-cgroup-v1 setting
2 parents 9da85db + 9d90a70 commit 7fd63bd

File tree

5 files changed

+24
-4
lines changed

5 files changed

+24
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ settings-extension-ecs = { path = "./bottlerocket-settings-models/settings-exten
7878
settings-extension-host-containers = { path = "./bottlerocket-settings-models/settings-extensions/host-containers", version = "0.2" }
7979
settings-extension-image-verifier-plugins = { path = "./bottlerocket-settings-models/settings-extensions/image-verifier-plugins", version = "0.1" }
8080
settings-extension-kernel = { path = "./bottlerocket-settings-models/settings-extensions/kernel", version = "0.1" }
81-
settings-extension-kubernetes = { path = "./bottlerocket-settings-models/settings-extensions/kubernetes", version = "0.6" }
81+
settings-extension-kubernetes = { path = "./bottlerocket-settings-models/settings-extensions/kubernetes", version = "0.7" }
8282
settings-extension-kubelet-device-plugins = { path = "./bottlerocket-settings-models/settings-extensions/kubelet-device-plugins", version = "0.3" }
8383
settings-extension-metrics = { path = "./bottlerocket-settings-models/settings-extensions/metrics", version = "0.1" }
8484
settings-extension-motd = { path = "./bottlerocket-settings-models/settings-extensions/motd", version = "0.1" }

bottlerocket-settings-models/CHANGELOG.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
- See [unreleased changes here]
1111

12-
[unreleased changes here]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.17.0...HEAD
12+
[unreleased changes here]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.18.0...HEAD
13+
14+
## [0.18.0] - 2026-01-05
15+
16+
## Model Changes
17+
18+
### Added
19+
20+
- Added `fail-cgroup-v1` kubernetes setting ([#108])
21+
22+
### Changed
23+
24+
- Updated regex for `NvidiaGpuModel` validation ([#105])
25+
26+
[#105]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/pull/105
27+
[#108]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/pull/108
28+
29+
[0.18.0]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.17.0...bottlerocket-settings-models-v0.18.0
1330

1431
## [0.17.0] - 2025-11-05
1532

bottlerocket-settings-models/settings-extensions/kubernetes/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "settings-extension-kubernetes"
3-
version = "0.6.0"
3+
version = "0.7.0"
44
authors = ["Sean P. Kelly <seankell@amazon.com>"]
55
license = "Apache-2.0 OR MIT"
66
edition = "2021"

bottlerocket-settings-models/settings-extensions/kubernetes/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ pub struct KubernetesSettingsV1 {
100100
hostname_override: ValidLinuxHostname,
101101
ids_per_pod: KubernetesIdsPerPodValue,
102102
max_parallel_image_pulls: i32,
103+
#[serde(alias = "fail-cgroupv1")]
104+
fail_cgroup_v1: bool,
103105
}
104106

105107
type Result<T> = std::result::Result<T, Infallible>;
@@ -207,6 +209,7 @@ mod test {
207209
static_pods_enabled: None,
208210
ids_per_pod: None,
209211
max_parallel_image_pulls: None,
212+
fail_cgroup_v1: None,
210213
})
211214
);
212215
}

bottlerocket-settings-models/settings-models/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bottlerocket-settings-models"
3-
version = "0.17.0"
3+
version = "0.18.0"
44
authors = ["Tom Kirchner <tjk@amazon.com>"]
55
license = "Apache-2.0 OR MIT"
66
edition = "2021"

0 commit comments

Comments
 (0)