From f8d31233e5db42044e48bf83f7a7bf803907ff16 Mon Sep 17 00:00:00 2001 From: "Patrick J.P. Culp" Date: Tue, 4 Oct 2022 20:16:04 +0000 Subject: [PATCH] models/yamlgen: fix clippy warnings --- models/src/node/crd/v2.rs | 16 ++++++---------- models/src/node/drain.rs | 15 +++++++-------- yamlgen/build.rs | 6 +++--- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/models/src/node/crd/v2.rs b/models/src/node/crd/v2.rs index 513fc1ae..ffa8820c 100644 --- a/models/src/node/crd/v2.rs +++ b/models/src/node/crd/v2.rs @@ -77,14 +77,13 @@ impl BottlerocketShadowState { impl From for BottlerocketShadowState { fn from(previous_state: BottlerocketShadowStateV1) -> Self { // TODO: Remap the state when merge PR with preventing controller from being unscheduled - let new_state = match previous_state { + match previous_state { BottlerocketShadowStateV1::Idle => Self::Idle, BottlerocketShadowStateV1::StagedUpdate => Self::StagedAndPerformedUpdate, BottlerocketShadowStateV1::PerformedUpdate => Self::StagedAndPerformedUpdate, BottlerocketShadowStateV1::RebootedIntoUpdate => Self::RebootedIntoUpdate, BottlerocketShadowStateV1::MonitoringUpdate => Self::MonitoringUpdate, - }; - new_state + } } } @@ -290,13 +289,11 @@ impl From for BottlerocketShadow { let previous_spec = previous_shadow.spec; let previous_status = previous_shadow.status; - let status = match previous_status { - None => None, - Some(previous_status) => Some(BottlerocketShadowStatus::from(previous_status)), - }; + let status = previous_status.map(BottlerocketShadowStatus::from); let spec = BottlerocketShadowSpec::from(previous_spec); - let new_shadow = BottlerocketShadow { + + BottlerocketShadow { metadata: ObjectMeta { /// The converted object has to maintain the same name, namespace and uid name: previous_metadata.name, @@ -307,8 +304,7 @@ impl From for BottlerocketShadow { }, spec, status, - }; - new_shadow + } } } diff --git a/models/src/node/drain.rs b/models/src/node/drain.rs index adf6ee46..55328bec 100644 --- a/models/src/node/drain.rs +++ b/models/src/node/drain.rs @@ -88,7 +88,6 @@ pub(crate) async fn drain_node( stream::iter(target_pods) .for_each_concurrent(CONCURRENT_EVICTIONS, move |pod| { let k8s_client = k8s_client.clone(); - let pod = pod.clone(); async move { // If an eviction for a Pod fails, it's either because: // * The eviction would never succeed (the Pod doesn't exist, we lack permissions to evict them, etc) @@ -169,7 +168,7 @@ fn filter_pods>(pods: F) -> impl Iterator { } } - return true; + true }) } @@ -226,7 +225,7 @@ async fn evict_pod(k8s_client: &kube::Client, pod: &Pod) -> Result<(), error::Ev Ok(StatusCode::NOT_FOUND) => { return Err(error::EvictionError::NonRetriableEviction { source: kube::Error::Api(e.clone()), - pod_name: pod.name().to_string(), + pod_name: pod.name(), }); } Ok(StatusCode::FORBIDDEN) => { @@ -235,7 +234,7 @@ async fn evict_pod(k8s_client: &kube::Client, pod: &Pod) -> Result<(), error::Ev // API error statuses to determine if we can proceed, so we ignore these. return Err(error::EvictionError::NonRetriableEviction { source: kube::Error::Api(e.clone()), - pod_name: pod.name().to_string(), + pod_name: pod.name(), }); } Ok(_) => { @@ -247,7 +246,7 @@ async fn evict_pod(k8s_client: &kube::Client, pod: &Pod) -> Result<(), error::Ev ); return Err(error::EvictionError::RetriableEviction { source: kube::Error::Api(e.clone()), - pod_name: pod.name().to_string(), + pod_name: pod.name(), }); } Err(_) => { @@ -258,7 +257,7 @@ async fn evict_pod(k8s_client: &kube::Client, pod: &Pod) -> Result<(), error::Ev ); return Err(error::EvictionError::RetriableEviction { source: kube::Error::Api(e.clone()), - pod_name: pod.name().to_string(), + pod_name: pod.name(), }); } } @@ -267,7 +266,7 @@ async fn evict_pod(k8s_client: &kube::Client, pod: &Pod) -> Result<(), error::Ev event!(Level::ERROR, "Eviction failed: '{}'. Retrying...", e); return Err(error::EvictionError::RetriableEviction { source: e, - pod_name: pod.name().to_string(), + pod_name: pod.name(), }); } } @@ -328,7 +327,7 @@ async fn wait_for_deletion(k8s_client: &kube::Client, pod: &Pod) -> Result<(), e /// Creates a kube::Api for interacting with Pods in the namespace associated with the given Pod. fn namespaced_pod_api(k8s_client: &kube::Client, pod: &Pod) -> Api { match pod.metadata.namespace.as_ref() { - Some(ns) => Api::namespaced(k8s_client.clone(), &ns), + Some(ns) => Api::namespaced(k8s_client.clone(), ns), None => Api::default_namespaced(k8s_client.clone()), } } diff --git a/yamlgen/build.rs b/yamlgen/build.rs index 24cc97d0..d4c552a0 100644 --- a/yamlgen/build.rs +++ b/yamlgen/build.rs @@ -60,7 +60,7 @@ fn main() { .to_lowercase(); // Make sure it is integer if it is not "unlimited" if !max_concurrent_update.eq("unlimited") { - max_concurrent_update.clone().parse::().unwrap(); + max_concurrent_update.parse::().unwrap(); } serde_yaml::to_writer(&brupop_resources, &brupop_namespace()).unwrap(); @@ -109,8 +109,8 @@ fn main() { serde_yaml::to_writer( &brupop_resources, &controller_deployment( - brupop_image.clone(), - brupop_image_pull_secrets.clone(), + brupop_image, + brupop_image_pull_secrets, max_concurrent_update, ), )