Skip to content

Improve regex for NvidiaGpuModel #105

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Improve regex for NvidiaGpuModel #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions bottlerocket-settings-models/modeled-types/src/kubernetes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,7 @@ pub struct NvidiaGpuModel {
}

lazy_static! {
pub(crate) static ref NVIDIAGPU_NAME: Regex = Regex::new(r"^([a-z])(\d+)\.(\d+)gb$").unwrap();
pub(crate) static ref NVIDIAGPU_NAME: Regex = Regex::new(r"^([a-z0-9]+).(\d+)gb$").unwrap();
}

impl TryFrom<&str> for NvidiaGpuModel {
Expand Down Expand Up @@ -1652,7 +1652,13 @@ mod test_nvidia_device_plugins {

#[test]
fn valid_gpu_model() {
for ok in &["a100.40gb", "a100.80gb", "h100.80gb", "h100.141gb"] {
for ok in &[
"a100.40gb",
"a100.80gb",
"h100.80gb",
"h100.141gb",
"rtxpro6000.98gb",
] {
assert!(NvidiaGpuModel::try_from(*ok).is_ok());
}
}
Expand Down