bump deps, remove manual boundary svcs advertisement

oxidecomputer · Jan 9, 2024 · 43d5f0a · 43d5f0a
1 parent ad77df0
commit 43d5f0a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
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 = "17a81abad29bc75b499422e6227fb6044da6b467"
+source.commit = "f2fc0ddcd78525dc32641d6c03483f2310399f6e"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/maghemite.sha256.txt
-source.sha256 = "200f951a155a0603b3ade8c6f00495e407d88d0648f6dc6747dcf340d38dbf07"
+source.sha256 = "008d6ca5c54239cba8191c3c0561ec4415daf72938164f35da3a823b78b77283"
 output.type = "tarball"
 
 [package.mg-ddm]
@@ -453,7 +453,7 @@ 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 = "17a81abad29bc75b499422e6227fb6044da6b467"
+source.commit = "f2fc0ddcd78525dc32641d6c03483f2310399f6e"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
 source.sha256 = "989ccd4a14b63fbfc651c3df5c80201af800905dda18aa21159fa3d88ce4b39b"
@@ -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 = "17a81abad29bc75b499422e6227fb6044da6b467"
+source.commit = "f2fc0ddcd78525dc32641d6c03483f2310399f6e"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
-source.sha256 = "696ffe650544ab878ab8126a00ae7addfd98c7cf764b2f60043bf6e0271deabc"
+source.sha256 = "57e98e99c5a21e856a4f356f6e6888494c4a62ac0044b75cdc36239377d4d78d"
 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
@@ -6,8 +6,7 @@
 
 use anyhow::{anyhow, Context};
 use bootstore::schemes::v0 as bootstore;
-use ddm_admin_client::types::{IpPrefix, Ipv4Prefix, TunnelOrigin};
-use ddm_admin_client::{Client as DdmAdminClient, DdmError};
+use ddm_admin_client::DdmError;
 use dpd_client::types::{Ipv6Entry, RouteSettingsV6};
 use dpd_client::types::{
     LinkCreate, LinkId, LinkSettings, PortId, PortSettings, RouteSettingsV4,
@@ -20,8 +19,8 @@ use internal_dns::ServiceName;
 use ipnetwork::{IpNetwork, Ipv6Network};
 use mg_admin_client::types::{ApplyRequest, BgpPeerConfig, Prefix4};
 use mg_admin_client::Client as MgdClient;
-use omicron_common::address::{Ipv6Subnet, MGD_PORT, MGS_PORT};
-use omicron_common::address::{DDMD_PORT, DENDRITE_PORT};
+use omicron_common::address::DENDRITE_PORT;
+use omicron_common::address::{MGD_PORT, MGS_PORT};
 use omicron_common::api::internal::shared::{
     BgpConfig, PortConfigV1, PortFec, PortSpeed, RackNetworkConfig,
     RackNetworkConfigV1, SwitchLocation, UplinkConfig,
@@ -455,6 +454,7 @@ impl<'a> EarlyNetworkSetup<'a> {
                 ))
             })?;
 
+            /* XXX now done automatically by mgd
             info!(self.log, "advertising boundary services loopback address");
 
             let ddmd_addr =
@@ -471,6 +471,7 @@ impl<'a> EarlyNetworkSetup<'a> {
                 boundary_addr: ipv6_entry.addr,
                 vni: 99,
             });
+            */
         }
 
         let mgd = MgdClient::new(

diff --git a/tools/maghemite_ddm_openapi_version b/tools/maghemite_ddm_openapi_version
@@ -1,2 +1,2 @@
-COMMIT="17a81abad29bc75b499422e6227fb6044da6b467"
+COMMIT="f2fc0ddcd78525dc32641d6c03483f2310399f6e"
 SHA2="0b0dbc2f8bbc5d2d9be92d64c4865f8f9335355aae62f7de9f67f81dfb3f1803"
diff --git a/tools/maghemite_mg_openapi_version b/tools/maghemite_mg_openapi_version
@@ -1,2 +1,2 @@
-COMMIT="17a81abad29bc75b499422e6227fb6044da6b467"
+COMMIT="f2fc0ddcd78525dc32641d6c03483f2310399f6e"
 SHA2="931efa310d972b1f8afba2308751fc6a2035afbaebba77b3a40a8358c123ba3c"
diff --git a/tools/maghemite_mgd_checksums b/tools/maghemite_mgd_checksums
@@ -1,2 +1,2 @@
-CIDL_SHA256="696ffe650544ab878ab8126a00ae7addfd98c7cf764b2f60043bf6e0271deabc"
+CIDL_SHA256="57e98e99c5a21e856a4f356f6e6888494c4a62ac0044b75cdc36239377d4d78d"
 MGD_LINUX_SHA256="11a0482d77caaebfaaeadb9bbccf0481fa07827ab73417a292758c060bfe5b7a"