pluto: don't error on missing settings

sources/api/pluto/src/api.rs

@@ -5,8 +5,8 @@ use std::net::IpAddr;
 pub(super) type Result<T> = std::result::Result<T, Error>;
 
 pub(crate) struct AwsK8sInfo {
-    pub(crate) region: String,
-    pub(crate) cluster_name: String,
+    pub(crate) region: Option<String>,
+    pub(crate) cluster_name: Option<String>,
     pub(crate) cluster_dns_ip: Option<IpAddr>,
 }
 
@@ -16,8 +16,8 @@ pub(crate) struct AwsK8sInfo {
 #[cfg(aws_k8s_variant)]
 mod inner {
     use super::*;
-    use snafu::{OptionExt, ResultExt, Snafu};
     use constants;
+    use snafu::{ResultExt, Snafu};
 
     #[derive(Debug, Snafu)]
     pub(crate) enum Error {
@@ -27,9 +27,6 @@ mod inner {
             uri: String,
         },
 
-        #[snafu(display("The '{}' setting is missing", setting))]
-        Missing { setting: String },
-
         #[snafu(display("Unable to deserialize Bottlerocket settings: {}", source))]
         SettingsJson { source: serde_json::Error },
     }
@@ -48,23 +45,17 @@ mod inner {
     /// Gets the info that we need to know about the EKS cluster from the Bottlerocket API.
     pub(crate) async fn get_aws_k8s_info() -> Result<AwsK8sInfo> {
         let settings = get_settings().await?;
-        let kubernetes = settings.kubernetes.context(Missing {
-            setting: "kubernetes",
-        })?;
         Ok(AwsK8sInfo {
-            region: settings
-                .aws
-                .context(Missing { setting: "aws" })?
-                .region
-                .context(Missing { setting: "region" })?
-                .into(),
-            cluster_name: kubernetes
-                .cluster_name
-                .context(Missing {
-                    setting: "cluster-name",
-                })?
-                .into(),
-            cluster_dns_ip: kubernetes.cluster_dns_ip,
+            region: settings.aws.and_then(|a| a.region).map(|s| s.into()),
+            cluster_name: settings
+                .kubernetes
+                .as_ref()
+                .and_then(|k| k.cluster_name.clone())
+                .map(|s| s.into()),
+            cluster_dns_ip: settings
+                .kubernetes
+                .and_then(|k| k.cluster_dns_ip)
+                .map(|s| s.into()),
         })
     }
 }

sources/api/pluto/src/main.rs

@@ -172,15 +172,17 @@ async fn get_max_pods(client: &mut ImdsClient) -> Result<String> {
 async fn get_cluster_dns_ip(client: &mut ImdsClient) -> Result<String> {
     // Retrieve the kubernetes network configuration for the EKS cluster
     if let Ok(aws_k8s_info) = api::get_aws_k8s_info().await.context(error::AwsInfo) {
-        if let Ok(config) =
-            eks::get_cluster_network_config(&aws_k8s_info.region, &aws_k8s_info.cluster_name)
+        if let (Some(region), Some(cluster_name)) = (aws_k8s_info.region, aws_k8s_info.cluster_name)
+        {
+            if let Ok(config) = eks::get_cluster_network_config(&region, &cluster_name)
                 .await
                 .context(error::EksError)
-        {
-            // Derive cluster-dns-ip from the service IPv4 CIDR
-            if let Some(ipv4_cidr) = config.service_ipv_4_cidr {
-                if let Ok(dns_ip) = get_dns_from_ipv4_cidr(&ipv4_cidr) {
-                    return Ok(dns_ip);
+            {
+                // Derive cluster-dns-ip from the service IPv4 CIDR
+                if let Some(ipv4_cidr) = config.service_ipv_4_cidr {
+                    if let Ok(dns_ip) = get_dns_from_ipv4_cidr(&ipv4_cidr) {
+                        return Ok(dns_ip);
+                    }
                 }
             }
         }
@@ -273,13 +275,13 @@ async fn get_node_ip(client: &mut ImdsClient) -> Result<String> {
                 what: "node ipv4 address",
             }),
         IpAddr::V6(_) => {
-            return Ok(client
+            return client
                 .fetch_primary_ipv6_address()
                 .await
                 .context(error::ImdsRequest)?
                 .context(error::ImdsNone {
                     what: "ipv6s associated with primary network interface",
-                })?);
+                });
         }
     }
 }