cleanup, bump maghemite

oxidecomputer · Jan 12, 2024 · a0942ed · a0942ed
1 parent 8c117dd
commit a0942ed
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 89 deletions.
diff --git a/nexus/src/app/sagas/switch_port_settings_common.rs b/nexus/src/app/sagas/switch_port_settings_common.rs
@@ -83,43 +83,6 @@ pub(crate) fn api_to_dpd_port_settings(
         );
     }
 
-    /* XXX handled by mgd now
-    for r in &settings.routes {
-        match &r.dst {
-            IpNetwork::V4(n) => {
-                let gw = match r.gw.ip() {
-                    IpAddr::V4(gw) => gw,
-                    IpAddr::V6(_) => {
-                        return Err(
-                            "IPv4 destination cannot have IPv6 nexthop".into()
-                        )
-                    }
-                };
-                dpd_port_settings.v4_routes.insert(
-                    Ipv4Cidr { prefix: n.ip(), prefix_len: n.prefix() }
-                        .to_string(),
-                    vec![RouteSettingsV4 { link_id: link_id.0, nexthop: gw }],
-                );
-            }
-            IpNetwork::V6(n) => {
-                let gw = match r.gw.ip() {
-                    IpAddr::V6(gw) => gw,
-                    IpAddr::V4(_) => {
-                        return Err(
-                            "IPv6 destination cannot have IPv4 nexthop".into()
-                        )
-                    }
-                };
-                dpd_port_settings.v6_routes.insert(
-                    Ipv6Cidr { prefix: n.ip(), prefix_len: n.prefix() }
-                        .to_string(),
-                    vec![RouteSettingsV6 { link_id: link_id.0, nexthop: gw }],
-                );
-            }
-        }
-    }
-    */
-
     Ok(dpd_port_settings)
 }
 

diff --git a/package-manifest.toml b/package-manifest.toml
@@ -437,10 +437,10 @@ source.repo = "maghemite"
 # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
 # building `ddm-admin-client` (which will instruct you to update
 # `tools/maghemite_openapi_version`).
-source.commit = "295107c80f289171c6c92d79f6e7bc9afd3d598c"
+source.commit = "2d231953ac7ba240489efdae0709993c7dd1cd7f"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/maghemite.sha256.txt
-source.sha256 = "7b274bfd693caa90e0c402fb36729287d482ceb874401fe45d0462e00417936a"
+source.sha256 = "11c47ef0fc9076a304da63f9796b5a5519797d4e9f033f1c77e9e1ea785628fc"
 output.type = "tarball"
 
 [package.mg-ddm]
@@ -453,10 +453,10 @@ source.repo = "maghemite"
 # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
 # building `ddm-admin-client` (which will instruct you to update
 # `tools/maghemite_openapi_version`).
-source.commit = "295107c80f289171c6c92d79f6e7bc9afd3d598c"
+source.commit = "2d231953ac7ba240489efdae0709993c7dd1cd7f"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
-source.sha256 = "57b1877e5a1bad272d0e382266adb62ec9ca24efd78ea19a61ace2ce9e0ab745"
+source.sha256 = "e6cc2d0f679a4dd952506141fdf527b0545f501653093559f4d9a4cacf24084b"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -468,10 +468,10 @@ source.repo = "maghemite"
 # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
 # building `ddm-admin-client` (which will instruct you to update
 # `tools/maghemite_openapi_version`).
-source.commit = "295107c80f289171c6c92d79f6e7bc9afd3d598c"
+source.commit = "2d231953ac7ba240489efdae0709993c7dd1cd7f"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
-source.sha256 = "515e94cab9efe1046b78fbba6ff9b3bb466fdca63c689f11f3ee52553990b640"
+source.sha256 = "8638b47bc469e969b3e2fc96a2ba2e37ecd96c731118dbae2419c35146bccc49"
 output.type = "zone"
 output.intermediate_only = true
 

diff --git a/sled-agent/src/bootstrap/early_networking.rs b/sled-agent/src/bootstrap/early_networking.rs
@@ -456,25 +456,6 @@ impl<'a> EarlyNetworkSetup<'a> {
                     "unable to apply uplink port configuration: {e}"
                 ))
             })?;
-
-            /* XXX now done automatically by mgd
-            info!(self.log, "advertising boundary services loopback address");
-
-            let ddmd_addr =
-                SocketAddrV6::new(switch_zone_underlay_ip, DDMD_PORT, 0, 0);
-            let ddmd_client = DdmAdminClient::new(&self.log, ddmd_addr)?;
-
-            ddmd_client.advertise_prefix(Ipv6Subnet::new(ipv6_entry.addr));
-
-            ddmd_client.advertise_tunnel_endpoint(TunnelOrigin {
-                overlay_prefix: IpPrefix::V4(Ipv4Prefix {
-                    addr: Ipv4Addr::UNSPECIFIED,
-                    len: 0,
-                }),
-                boundary_addr: ipv6_entry.addr,
-                vni: 99,
-            });
-            */
         }
 
         let mgd = MgdClient::new(
@@ -641,27 +622,6 @@ impl<'a> EarlyNetworkSetup<'a> {
             ))
         })?;
 
-        /* XXX goes through mgd now
-        for r in &port_config.routes {
-            if let (IpNetwork::V4(dst), IpAddr::V4(nexthop)) =
-                (r.destination, r.nexthop)
-            {
-                dpd_port_settings.v4_routes.insert(
-                    dst.to_string(),
-                    vec![RouteSettingsV4 { link_id: link_id.0, nexthop }],
-                );
-            }
-            if let (IpNetwork::V6(dst), IpAddr::V6(nexthop)) =
-                (r.destination, r.nexthop)
-            {
-                dpd_port_settings.v6_routes.insert(
-                    dst.to_string(),
-                    vec![RouteSettingsV6 { link_id: link_id.0, nexthop }],
-                );
-            }
-        }
-        */
-
         Ok((ipv6_entry, dpd_port_settings, port_id))
     }
 

diff --git a/test-utils/src/dev/maghemite.rs b/test-utils/src/dev/maghemite.rs
@@ -47,8 +47,6 @@ impl MgdInstance {
             "--no-bgp-dispatcher".into(),
             "--data-dir".into(),
             temp_dir.path().display().to_string(),
-            "--tep".into(),
-            "fd00:99::1".into(),
         ];
 
         let child = tokio::process::Command::new("mgd")

diff --git a/tools/maghemite_ddm_openapi_version b/tools/maghemite_ddm_openapi_version
@@ -1,2 +1,2 @@
-COMMIT="295107c80f289171c6c92d79f6e7bc9afd3d598c"
+COMMIT="2d231953ac7ba240489efdae0709993c7dd1cd7f"
 SHA2="0b0dbc2f8bbc5d2d9be92d64c4865f8f9335355aae62f7de9f67f81dfb3f1803"
diff --git a/tools/maghemite_mg_openapi_version b/tools/maghemite_mg_openapi_version
@@ -1,2 +1,2 @@
-COMMIT="295107c80f289171c6c92d79f6e7bc9afd3d598c"
+COMMIT="2d231953ac7ba240489efdae0709993c7dd1cd7f"
 SHA2="7618511f905d26394ef7c552339dd78835ce36a6def0d85b05b6d1e363a5e7b4"
diff --git a/tools/maghemite_mgd_checksums b/tools/maghemite_mgd_checksums
@@ -1,2 +1,2 @@
-CIDL_SHA256="515e94cab9efe1046b78fbba6ff9b3bb466fdca63c689f11f3ee52553990b640"
-MGD_LINUX_SHA256="505cdc355e92e866cd53143f4c6c60ea1083083eb31c0b0942530da1b2965cc4"
+CIDL_SHA256="8638b47bc469e969b3e2fc96a2ba2e37ecd96c731118dbae2419c35146bccc49"
+MGD_LINUX_SHA256="1696c8d27b8da6865eaa5a753fc417b4105b0ea288d5675888e59e69053596eb"