Skip to content

Commit 53af467

Browse files
authored
Use operator-rs Duration (#292)
1 parent 8cb5909 commit 53af467

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

rust/operator-binary/src/history/history_controller.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use stackable_operator::{
55
builder::{ConfigMapBuilder, ContainerBuilder, ObjectMetaBuilder, PodBuilder, VolumeBuilder},
66
cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
77
commons::product_image_selection::ResolvedProductImage,
8+
duration::Duration,
89
k8s_openapi::{
910
api::{
1011
apps::v1::{StatefulSet, StatefulSetSpec},
@@ -45,8 +46,8 @@ use stackable_spark_k8s_crd::{
4546
s3logdir::S3LogDir,
4647
tlscerts,
4748
};
49+
use std::collections::HashMap;
4850
use std::{collections::BTreeMap, sync::Arc};
49-
use std::{collections::HashMap, time::Duration};
5051

5152
use snafu::{OptionExt, ResultExt, Snafu};
5253
use stackable_operator::builder::resources::ResourceRequirementsBuilder;
@@ -283,7 +284,7 @@ pub async fn reconcile(shs: Arc<SparkHistoryServer>, ctx: Arc<Ctx>) -> Result<Ac
283284
}
284285

285286
pub fn error_policy(_obj: Arc<SparkHistoryServer>, _error: &Error, _ctx: Arc<Ctx>) -> Action {
286-
Action::requeue(Duration::from_secs(5))
287+
Action::requeue(*Duration::from_secs(5))
287288
}
288289

289290
fn build_config_map(

rust/operator-binary/src/pod_driver_controller.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use stackable_operator::{
2-
client::Client, k8s_openapi::api::core::v1::Pod, kube::runtime::controller::Action,
2+
client::Client, duration::Duration, k8s_openapi::api::core::v1::Pod,
3+
kube::runtime::controller::Action,
34
};
45
use stackable_spark_k8s_crd::{
56
constants::POD_DRIVER_CONTROLLER_NAME, SparkApplication, SparkApplicationStatus,
67
};
78
use std::sync::Arc;
8-
use std::time::Duration;
99

1010
use snafu::{OptionExt, ResultExt, Snafu};
1111
use stackable_operator::logging::controller::ReconcilerError;
@@ -95,5 +95,5 @@ pub async fn reconcile(pod: Arc<Pod>, client: Arc<Client>) -> Result<Action> {
9595
}
9696

9797
pub fn error_policy(_obj: Arc<Pod>, _error: &Error, _ctx: Arc<Client>) -> Action {
98-
Action::requeue(Duration::from_secs(5))
98+
Action::requeue(*Duration::from_secs(5))
9999
}

rust/operator-binary/src/spark_k8s_controller.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ use crate::Ctx;
33
use std::{
44
collections::{BTreeMap, HashMap},
55
sync::Arc,
6-
time::Duration,
76
vec,
87
};
98

10-
use stackable_operator::product_config::writer::to_java_properties_string;
9+
use stackable_operator::{duration::Duration, product_config::writer::to_java_properties_string};
1110
use stackable_spark_k8s_crd::{
1211
constants::*, s3logdir::S3LogDir, tlscerts, RoleConfig, SparkApplication, SparkApplicationRole,
1312
SparkContainer, SubmitConfig,
@@ -863,5 +862,5 @@ fn security_context() -> PodSecurityContext {
863862
}
864863

865864
pub fn error_policy(_obj: Arc<SparkApplication>, _error: &Error, _ctx: Arc<Ctx>) -> Action {
866-
Action::requeue(Duration::from_secs(5))
865+
Action::requeue(*Duration::from_secs(5))
867866
}

0 commit comments

Comments
 (0)