fix: add ipam config while setting up container's network

Author: erasernoob

project/rkl/src/commands/compose/network.rs

@@ -14,6 +14,8 @@ use anyhow::Ok;
 use anyhow::Result;
 use anyhow::anyhow;
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use serde_json::json;
 
 pub const CNI_VERSION: &str = "1.0.0";
 pub const STD_CONF_PATH: &str = "/etc/cni/net.d";
@@ -49,10 +51,7 @@ pub struct CliNetworkConfig {
     pub mac_spoof_check: Option<bool>,
     /// IPAM type（like host-local, static, etc.）
     #[serde(default)]
-    pub ipam_type: Option<String>,
-    /// IPAM configuration's file path（Optional）
-    #[serde(default)]
-    pub ipam_config: Option<String>,
+    pub ipam: Option<IpamConfig>,
     /// enable hairpin mod
     #[serde(default)]
     pub hairpin_mode: Option<bool>,
@@ -63,6 +62,26 @@ pub struct CliNetworkConfig {
     #[serde(default)]
     pub vlan_trunk: Option<Vec<u16>>,
 }
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct IpamConfig {
+    /// Name of the IPAM plugin binary on disk.
+    ///
+    /// This is called `type` in the JSON.
+    #[serde(rename = "type")]
+    pub plugin: String,
+
+    /// All other IPAM fields.
+    ///
+    /// This is a [`serde(flatten)`](https://serde.rs/field-attrs.html#flatten)
+    /// field which aggregates any and all additional fields apart from the
+    /// `plugin` field above.
+    ///
+    /// The spec describes nothing in particular for this section, so it is
+    /// entirely up to plugins to interpret it as required.
+    #[serde(flatten)]
+    pub specific: HashMap<String, Value>,
+}
 
 impl CliNetworkConfig {
     pub fn from_name_bridge(network_name: &str, bridge: &str) -> Self {
@@ -76,6 +95,15 @@ impl CliNetworkConfig {
 
 impl Default for CliNetworkConfig {
     fn default() -> Self {
+        let specific: HashMap<String, serde_json::Value> = [
+            ("type", json!(BRIDGE_PLUGIN_NAME)),
+            ("subnet", json!("10.10.1.0/24")),
+            ("gateway", json!("10.10.1.0")),
+        ]
+        .into_iter()
+        .map(|(k, v)| (k.to_string(), v))
+        .collect();
+
         Self {
             cni_version: String::from(CNI_VERSION),
             plugin: String::from(BRIDGE_PLUGIN_NAME),
@@ -85,11 +113,13 @@ impl Default for CliNetworkConfig {
             is_gateway: Some(true),
             mtu: Some(1500),
             mac_spoof_check: Default::default(),
-            ipam_type: Default::default(),
-            ipam_config: Default::default(),
             hairpin_mode: Default::default(),
             vlan: Default::default(),
             vlan_trunk: Default::default(),
+            ipam: Some(IpamConfig {
+                plugin: BRIDGE_PLUGIN_NAME.to_string(),
+                specific,
+            }),
         }
     }
 }

project/rkl/src/commands/container/mod.rs

@@ -265,7 +265,7 @@ impl ContainerRunner {
             .clone()
             .build();
 
-        debug!("After Building Config: {:?}", config);
+        debug!("After building config: {:#?}", config);
         self.config = Some(config);
         Ok(())
     }
@@ -277,7 +277,7 @@ impl ContainerRunner {
             .as_ref()
             .ok_or_else(|| anyhow!("Container's Config is required"))?;
 
-        debug!("Get Config: {:#?}", config);
+        debug!("Get container config while create oci_spec: {:#?}", config);
 
         let mut spec = Spec::default();
 
@@ -288,7 +288,6 @@ impl ContainerRunner {
         spec.set_root(Some(root));
 
         // use the default namespace configuration
-
         let namespaces = get_default_namespaces();
 
         let mut linux: LinuxBuilder = LinuxBuilder::default().namespaces(namespaces);
@@ -326,13 +325,20 @@ impl ContainerRunner {
         // determine if it's in the single mode
 
         //  create oci spec
-        let spec: Spec = self.create_oci_spec()?;
+        let oci_spec: Spec = self.create_oci_spec()?;
+
+        debug!(
+            "[container {}] created oci_spec {:?}",
+            self.spec.name, oci_spec
+        );
 
         // create a config.path at the bundle path
-        // TODO: Here use the local file path directly
         let bundle_path = self.spec.image.clone();
         if bundle_path.is_empty() {
-            return Err(anyhow!("Bundle path (image) is empty"));
+            return Err(anyhow!(
+                "[container {}] Bundle path is empty",
+                self.spec.name
+            ));
         }
         let bundle_dir = Path::new(&bundle_path);
         if !bundle_dir.exists() {
@@ -351,7 +357,7 @@ impl ContainerRunner {
         }
         let file = File::create(&config_path)?;
         let mut writer = BufWriter::new(file);
-        serde_json::to_writer_pretty(&mut writer, &spec)?;
+        serde_json::to_writer_pretty(&mut writer, &oci_spec)?;
         writer.flush()?;
 
         let create_args = Create {