Skip to content

Commit eed641b

Browse files
authored
Merge pull request #98 from koooosh/add-reserve-compute-settings
feat: update k8s kube-reserved and system-reserved settings to specify pid
2 parents 113a9d5 + 799b9b1 commit eed641b

File tree

6 files changed

+19
-6
lines changed

6 files changed

+19
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ bottlerocket-template-helper = { path = "./bottlerocket-template-helper", versio
5858

5959
# Settings Models
6060
bottlerocket-model-derive = { path = "./bottlerocket-settings-models/model-derive", version = "0.1" }
61-
bottlerocket-modeled-types = { path = "./bottlerocket-settings-models/modeled-types", version = "0.11" }
61+
bottlerocket-modeled-types = { path = "./bottlerocket-settings-models/modeled-types", version = "0.12" }
6262
bottlerocket-scalar = { path = "./bottlerocket-settings-models/scalar", version = "0.1" }
6363
bottlerocket-scalar-derive = { path = "./bottlerocket-settings-models/scalar-derive", version = "0.1" }
6464
bottlerocket-string-impls-for = { path = "./bottlerocket-settings-models/string-impls-for", version = "0.1" }

bottlerocket-settings-models/CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,19 @@ 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.15.0...HEAD
12+
[unreleased changes here]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.16.0...HEAD
13+
14+
## [0.16.0] - 2025-09-19
15+
16+
## Model Changes
17+
18+
### Added
19+
20+
- Added `pid` setting to the `kube-reserved` and `system-reserved` kubernetes settings ([#98])
21+
22+
[#98]:https://github.com/bottlerocket-os/bottlerocket-settings-sdk/pull/98
23+
24+
[0.16.0]: https://github.com/bottlerocket-os/bottlerocket-settings-sdk/compare/bottlerocket-settings-models-v0.15.0...bottlerocket-settings-models-v0.16.0
1325

1426
## [0.15.0] - 2025-09-11
1527

bottlerocket-settings-models/modeled-types/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-modeled-types"
3-
version = "0.11.0"
3+
version = "0.12.0"
44
authors = []
55
license = "Apache-2.0 OR MIT"
66
edition = "2021"

bottlerocket-settings-models/modeled-types/src/kubernetes.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,7 @@ enum ReservedResources {
628628
Memory,
629629
#[serde(rename = "ephemeral-storage")]
630630
EphemeralStorage,
631+
Pid,
631632
}
632633

633634
impl TryFrom<&str> for KubernetesReservedResourceKey {
@@ -656,7 +657,7 @@ mod test_reserved_resources_key {
656657

657658
#[test]
658659
fn good_reserved_resources_key() {
659-
for ok in &["cpu", "memory", "ephemeral-storage"] {
660+
for ok in &["cpu", "memory", "ephemeral-storage", "pid"] {
660661
KubernetesReservedResourceKey::try_from(*ok).unwrap();
661662
}
662663
}

bottlerocket-settings-models/scalar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ impl Display for ValidationError {
185185
impl Error for ValidationError {
186186
/// Return the underlying error if there is one.
187187
fn source(&self) -> Option<&(dyn Error + 'static)> {
188-
self.source.as_ref().map(|e| e.as_ref() as &(dyn Error))
188+
self.source.as_ref().map(|e| e.as_ref() as &dyn Error)
189189
}
190190
}
191191

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.15.0"
3+
version = "0.16.0"
44
authors = ["Tom Kirchner <[email protected]>"]
55
license = "Apache-2.0 OR MIT"
66
edition = "2021"

0 commit comments

Comments
 (0)