Skip to content

Commit

Permalink
chore: Address Clippy lints and nested-ifs (#76)
Browse files Browse the repository at this point in the history
Signed-off-by: Joonas Bergius <joonas@cosmonic.com>
  • Loading branch information
joonas committed Jul 26, 2024
1 parent 69dac08 commit 5988e64
Showing 1 changed file with 21 additions and 15 deletions.
36 changes: 21 additions & 15 deletions src/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -377,11 +377,14 @@ async fn pod_template(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Result

let mut nats_resources: Option<k8s_openapi::api::core::v1::ResourceRequirements> = None;
let mut wasmcloud_resources: Option<k8s_openapi::api::core::v1::ResourceRequirements> = None;
if let Some(scheduling_options) = &config.spec.scheduling_options {
if let Some(resources) = &scheduling_options.resources {
nats_resources = resources.nats.clone();
wasmcloud_resources = resources.wasmcloud.clone();
}
if let Some(resources) = &config
.spec
.scheduling_options
.as_ref()
.and_then(|so| so.resources.clone())
{
nats_resources.clone_from(&resources.nats);
wasmcloud_resources.clone_from(&resources.wasmcloud);
}

let image = match &config.spec.image {
Expand Down Expand Up @@ -581,17 +584,20 @@ async fn pod_template(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Result
}),
};

if let Some(scheduling_options) = &config.spec.scheduling_options {
if let Some(pod_overrides) = &scheduling_options.pod_template_additions {
let mut overrides = pod_overrides.clone();
overrides.service_account_name = Some(service_account);
overrides.containers = containers.clone();
if let Some(vols) = overrides.volumes {
volumes.extend(vols);
}
overrides.volumes = Some(volumes);
template.spec = Some(overrides);
if let Some(pod_overrides) = &config
.spec
.scheduling_options
.as_ref()
.and_then(|so| so.pod_template_additions.clone())
{
let mut overrides = pod_overrides.clone();
overrides.service_account_name = Some(service_account);
overrides.containers.clone_from(&containers);
if let Some(vols) = overrides.volumes {
volumes.extend(vols);
}
overrides.volumes = Some(volumes);
template.spec = Some(overrides);
};
Ok(template)
}
Expand Down

0 comments on commit 5988e64

Please sign in to comment.