From e2c4527131ac511d93b244ac05e464895fec66a4 Mon Sep 17 00:00:00 2001 From: shigedangao Date: Tue, 19 Nov 2024 22:55:49 +0100 Subject: [PATCH] some improvements --- src/cli/mod.rs | 2 +- src/kube/mod.rs | 4 ++-- src/kube/spec.rs | 21 ++++++++++++--------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/cli/mod.rs b/src/cli/mod.rs index 21b416f..01f7114 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -24,7 +24,7 @@ pub struct Cli { pub namespace: String, #[arg(short, long, default_value = "3")] - pub backoff_limit: usize, + pub backoff_limit: i32, } impl Cli { diff --git a/src/kube/mod.rs b/src/kube/mod.rs index b6269ae..1139014 100644 --- a/src/kube/mod.rs +++ b/src/kube/mod.rs @@ -75,7 +75,7 @@ where &mut self, name: N, mut job_spec: JobSpec, - backoff_limit: usize, + backoff_limit: i32, ) -> Result<&Self> { let mut job: Job = serde_json::from_value(json!({ "apiVersion": "batch/v1", @@ -86,7 +86,7 @@ where "spec": {} }))?; - job_spec.backoff_limit = Some(backoff_limit as i32); + job_spec.backoff_limit = Some(backoff_limit); job.spec = Some(job_spec); self.job = Some(job); diff --git a/src/kube/spec.rs b/src/kube/spec.rs index 16d3768..21787b9 100644 --- a/src/kube/spec.rs +++ b/src/kube/spec.rs @@ -73,18 +73,21 @@ impl SpecHandler for JobSpec { .ok_or_else(|| anyhow!("Unable to found pod spec on job"))?; for (idx, container) in pod_spec.containers.iter_mut().enumerate() { - let Some(updated_env) = - envs.get(idx) + let updated_env = + match envs + .get(idx) .and_then(|cont| match cont.name == container.name { true => Some(cont), false => None, - }) - else { - return Err(anyhow!( - "Unable to get the environment variable for the container {:?}", - container.name - )); - }; + }) { + Some(updated_env) => updated_env, + None => { + return Err(anyhow!( + "Unable to get the environment variable for the container {:?}", + container.name + )); + } + }; if let Some(container_envs) = container.env.as_mut() { for container_env in container_envs {