Add multiple k8s settings #104
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1492,6 +1492,54 @@ mod test_kubernetes_memory_swap_behavior { | |
|
|
||
| // =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= | ||
|
|
||
| /// KubernetesIdsPerPodValue represents an integer that contains a valid Kubernetes idsPerPod value. | ||
| /// Must be a multiple of 65536 and less than 1<<32. | ||
| #[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] | ||
| #[serde(try_from = "i64", into = "i64")] | ||
| pub struct KubernetesIdsPerPodValue { | ||
| inner: i64, | ||
|
There was a problem hiding this comment. Any reason why we are not using u32 instead of i64? There was a problem hiding this comment. I checked the other integer settings we have, and I saw that historically we have matched the kubelet config docs. For IdsPerPod, it's listed as int64. |
||
| } | ||
|
|
||
| impl TryFrom<i64> for KubernetesIdsPerPodValue { | ||
| type Error = error::Error; | ||
|
|
||
| fn try_from(input: i64) -> Result<Self, Self::Error> { | ||
| ensure!( | ||
| input % 65536 == 0 && input < (1i64 << 32), | ||
|
There was a problem hiding this comment. Could you please add a note on this validation for future references? It would be great If you can find the code in the kubelet that performs that validation. |
||
| error::InvalidKubernetesIdsPerPodValueSnafu { input } | ||
| ); | ||
| Ok(KubernetesIdsPerPodValue { inner: input }) | ||
| } | ||
| } | ||
|
|
||
| impl From<KubernetesIdsPerPodValue> for i64 { | ||
| fn from(val: KubernetesIdsPerPodValue) -> Self { | ||
| val.inner | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test_kubernetes_ids_per_pod_value { | ||
| use super::KubernetesIdsPerPodValue; | ||
| use std::convert::TryFrom; | ||
|
|
||
| #[test] | ||
| fn good_values() { | ||
| for ok in &[0, 65536, 131072, 196608, 4294901760] { | ||
| KubernetesIdsPerPodValue::try_from(*ok).unwrap(); | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn bad_values() { | ||
| for err in &[1, 65535, 65537, 4294967296] { | ||
| KubernetesIdsPerPodValue::try_from(*err).unwrap_err(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= | ||
|
|
||
| /// NvidiaDevicePluginSettings contains the device sharing and partitioning related settings for Nvidia gpu. | ||
| #[model(impl_default = true)] | ||
| pub struct NvidiaDevicePluginSettings { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "settings-extension-kubernetes" | ||
| version = "0.6.0" | ||
| authors = ["Sean P. Kelly <[email protected]>"] | ||
| license = "Apache-2.0 OR MIT" | ||
| edition = "2021" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -5,11 +5,11 @@ use bottlerocket_modeled_types::{ | |||||
| KubernetesAuthenticationMode, KubernetesBootstrapToken, KubernetesCPUManagerPolicyOption, | ||||||
| KubernetesCloudProvider, KubernetesClusterDnsIp, KubernetesClusterName, | ||||||
| KubernetesDurationValue, KubernetesEvictionKey, KubernetesHostnameOverrideSource, | ||||||
| KubernetesIdsPerPodValue, KubernetesLabelKey, KubernetesLabelValue, | ||||||
| KubernetesMemoryManagerPolicy, KubernetesMemoryReservation, KubernetesMemorySwapBehavior, | ||||||
| KubernetesQuantityValue, KubernetesReservedResourceKey, KubernetesTaintValue, | ||||||
| KubernetesThresholdValue, NonNegativeInteger, SingleLineString, TopologyManagerPolicy, | ||||||
| TopologyManagerScope, Url, ValidBase64, ValidLinuxHostname, | ||||||
| }; | ||||||
| use bottlerocket_settings_sdk::{GenerateResult, SettingsModel}; | ||||||
|
|
||||||
|
|
@@ -96,6 +96,8 @@ pub struct KubernetesSettingsV1 { | |||||
| node_ip: IpAddr, | ||||||
| pod_infra_container_image: SingleLineString, | ||||||
|
There was a problem hiding this comment. This commit is missing its |
||||||
| hostname_override: ValidLinuxHostname, | ||||||
| ids_per_pod: KubernetesIdsPerPodValue, | ||||||
|
There was a problem hiding this comment. We use i64 directly in the shape. For consistency, let's just do:
Suggested change
And we can drop the custom model type There was a problem hiding this comment. This API has a restriction on the value so the type seems right:
|
||||||
| max_parallel_image_pulls: i32, | ||||||
| } | ||||||
|
|
||||||
| type Result<T> = std::result::Result<T, Infallible>; | ||||||
|
|
@@ -199,6 +201,8 @@ mod test { | |||||
| device_ownership_from_security_context: None, | ||||||
| single_process_oom_kill: None, | ||||||
| static_pods_enabled: None, | ||||||
| ids_per_pod: None, | ||||||
| max_parallel_image_pulls: None, | ||||||
| }) | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "bottlerocket-settings-models" | ||
| version = "0.17.0" | ||
| authors = ["Tom Kirchner <[email protected]>"] | ||
| license = "Apache-2.0 OR MIT" | ||
| edition = "2021" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This commit is missing its signed-off tag