Skip to content

Commit f9dd2c9

Browse files
committed
refactor!(stackable-operator): Fix and improve quantity parsing
1 parent 048c7d8 commit f9dd2c9

File tree

10 files changed

+652
-1038
lines changed

10 files changed

+652
-1038
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/stackable-operator/src/builder/pod/resources.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ use k8s_openapi::{
55
};
66
use tracing::warn;
77

8-
use crate::{
9-
commons::resources::ResourceRequirementsType,
10-
cpu::{self, CpuQuantity},
11-
memory::{self, MemoryQuantity},
12-
};
8+
use crate::{commons::resources::ResourceRequirementsType, quantity::CpuQuantity};
139

1410
const RESOURCE_DENYLIST: &[&str] = &["cpu", "memory"];
1511

crates/stackable-operator/src/commons/resources.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@
6868
//! }
6969
//! ```
7070
71-
use crate::{
72-
config::{
73-
fragment::{Fragment, FromFragment},
74-
merge::Merge,
75-
},
76-
cpu::CpuQuantity,
77-
memory::MemoryQuantity,
78-
};
7971
use educe::Educe;
8072
use k8s_openapi::api::core::v1::{
8173
Container, PersistentVolumeClaim, PersistentVolumeClaimSpec, PodSpec, ResourceRequirements,
@@ -89,6 +81,12 @@ use snafu::{ResultExt, Snafu};
8981
use std::{collections::BTreeMap, fmt::Debug};
9082
use strum::Display;
9183

84+
use crate::config::{
85+
fragment::{Fragment, FromFragment},
86+
merge::Merge,
87+
};
88+
use crate::quantity::{CpuQuantity, MemoryQuantity};
89+
9290
pub const LIMIT_REQUEST_RATIO_CPU: f32 = 5.0;
9391
pub const LIMIT_REQUEST_RATIO_MEMORY: f32 = 1.0;
9492

crates/stackable-operator/src/cpu.rs

Lines changed: 0 additions & 307 deletions
This file was deleted.

crates/stackable-operator/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ pub mod client;
44
pub mod cluster_resources;
55
pub mod commons;
66
pub mod config;
7-
pub mod cpu;
87
pub mod crd;
98
pub mod helm;
109
pub mod iter;
1110
pub mod kvp;
1211
pub mod logging;
13-
pub mod memory;
1412
pub mod namespace;
1513
pub mod pod_utils;
1614
pub mod product_config_utils;
1715
pub mod product_logging;
16+
pub mod quantity;
1817
pub mod role_utils;
1918
pub mod status;
2019
pub mod time;

0 commit comments

Comments
 (0)