From 20a71c82c3f5541337a6b1e5fe4ffb0fcb2c8d5b Mon Sep 17 00:00:00 2001 From: Ryan Goodfellow Date: Tue, 20 Jan 2026 22:50:27 +0000 Subject: [PATCH] bump dendrite to 181 pulls in - oxidecomputer/dendrite#171 - oxidecomputer/dendrite#175 - oxidecomputer/dendrite#179 - oxidecomputer/dendrite#177 - oxidecomputer/dendrite#181 - oxidecomputer/sidecar-lite#133 - oxidecomputer/softnpu#150 --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- dev-tools/xtask/src/virtual_hardware.rs | 4 ++-- nexus/src/app/background/tasks/nat_cleanup.rs | 2 +- .../background/tasks/sync_service_zone_nat.rs | 2 +- nexus/src/app/instance_network.rs | 6 +++--- package-manifest.toml | 12 ++++++------ tools/dendrite_stub_checksums | 6 +++--- tools/dendrite_version | 2 +- tools/softnpu_version | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 93702b9c6c0..f6708987a4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1773,7 +1773,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=ab30fa91227fd478bfe0e023310ca83dec0bc22b#ab30fa91227fd478bfe0e023310ca83dec0bc22b" +source = "git+https://github.com/oxidecomputer/dendrite?rev=846348bf5c92ab490cf4f69fbe1202691dae6125#846348bf5c92ab490cf4f69fbe1202691dae6125" dependencies = [ "anyhow", "chrono", @@ -3007,11 +3007,11 @@ dependencies = [ [[package]] name = "dpd-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=ab30fa91227fd478bfe0e023310ca83dec0bc22b#ab30fa91227fd478bfe0e023310ca83dec0bc22b" +source = "git+https://github.com/oxidecomputer/dendrite?rev=846348bf5c92ab490cf4f69fbe1202691dae6125#846348bf5c92ab490cf4f69fbe1202691dae6125" dependencies = [ "async-trait", "chrono", - "common 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=ab30fa91227fd478bfe0e023310ca83dec0bc22b)", + "common 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=846348bf5c92ab490cf4f69fbe1202691dae6125)", "crc8", "futures", "http", @@ -7463,7 +7463,7 @@ dependencies = [ "crucible-agent-client", "dns-server", "dns-service-client", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=ab30fa91227fd478bfe0e023310ca83dec0bc22b)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=846348bf5c92ab490cf4f69fbe1202691dae6125)", "dropshot", "futures", "gateway-messages", @@ -8352,7 +8352,7 @@ dependencies = [ "display-error-chain", "dns-server", "dns-service-client", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=ab30fa91227fd478bfe0e023310ca83dec0bc22b)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=846348bf5c92ab490cf4f69fbe1202691dae6125)", "dropshot", "ereport-types", "expectorate", @@ -8835,7 +8835,7 @@ dependencies = [ "display-error-chain", "dns-server", "dns-service-client", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=ab30fa91227fd478bfe0e023310ca83dec0bc22b)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=846348bf5c92ab490cf4f69fbe1202691dae6125)", "dropshot", "expectorate", "flate2", @@ -16276,7 +16276,7 @@ name = "wicket-common" version = "0.1.0" dependencies = [ "anyhow", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=ab30fa91227fd478bfe0e023310ca83dec0bc22b)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=846348bf5c92ab490cf4f69fbe1202691dae6125)", "dropshot", "gateway-client", "gateway-types", @@ -16336,7 +16336,7 @@ dependencies = [ "clap", "debug-ignore", "display-error-chain", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=ab30fa91227fd478bfe0e023310ca83dec0bc22b)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=846348bf5c92ab490cf4f69fbe1202691dae6125)", "dropshot", "either", "expectorate", diff --git a/Cargo.toml b/Cargo.toml index 5700c0128b4..777feed0f7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -463,7 +463,7 @@ digest = "0.10.7" dns-server = { path = "dns-server" } dns-server-api = { path = "dns-server-api" } dns-service-client = { path = "clients/dns-service-client" } -dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "ab30fa91227fd478bfe0e023310ca83dec0bc22b" } +dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "846348bf5c92ab490cf4f69fbe1202691dae6125" } dropshot = { version = "0.16.6", features = [ "usdt-probes" ] } dropshot-api-manager = "0.2.4" dropshot-api-manager-types = "0.2.4" diff --git a/dev-tools/xtask/src/virtual_hardware.rs b/dev-tools/xtask/src/virtual_hardware.rs index aca8b979db5..0f58bf5bc4b 100644 --- a/dev-tools/xtask/src/virtual_hardware.rs +++ b/dev-tools/xtask/src/virtual_hardware.rs @@ -117,8 +117,8 @@ const ZPOOL: &'static str = "/usr/sbin/zpool"; const ZONEADM: &'static str = "/usr/sbin/zoneadm"; const SIDECAR_LITE_COMMIT: &'static str = - "a95b7a9f78c08125f4e34106f5c885c7e9f2e8d5"; -const SOFTNPU_COMMIT: &'static str = "3203c51cf4473d30991b522062ac0df2e045c2f2"; + "69fae2ac230cd29f4ea2bf3bcbd6d99554c7bc47"; +const SOFTNPU_COMMIT: &'static str = "e4c3130538b192988737161f4a4dc97272f02b9c"; const PXA_MAC_DEFAULT: &'static str = "a8:e1:de:01:70:1d"; const PXA_WARNING: &'static str = r#" You have not set up the proxy-ARP environment variables diff --git a/nexus/src/app/background/tasks/nat_cleanup.rs b/nexus/src/app/background/tasks/nat_cleanup.rs index 9efe1c7506b..5f6d3754c1d 100644 --- a/nexus/src/app/background/tasks/nat_cleanup.rs +++ b/nexus/src/app/background/tasks/nat_cleanup.rs @@ -92,7 +92,7 @@ impl BackgroundTask for Ipv4NatGarbageCollector { } for client in dpd_clients.values() { - let response = client.ipv4_nat_generation().await; + let response = client.nat_generation().await; match response { Ok(r#gen) => min_gen = std::cmp::min(min_gen, *r#gen), Err(error) => { diff --git a/nexus/src/app/background/tasks/sync_service_zone_nat.rs b/nexus/src/app/background/tasks/sync_service_zone_nat.rs index 3483d439c20..9c70fa4ce31 100644 --- a/nexus/src/app/background/tasks/sync_service_zone_nat.rs +++ b/nexus/src/app/background/tasks/sync_service_zone_nat.rs @@ -275,7 +275,7 @@ impl BackgroundTask for ServiceZoneNatTracker { }; for (_location, client) in dpd_clients { - if let Err(e) = client.ipv4_nat_trigger_update().await { + if let Err(e) = client.nat_trigger_update().await { error!( &log, "failed to trigger dpd rpw workflow"; diff --git a/nexus/src/app/instance_network.rs b/nexus/src/app/instance_network.rs index ab5f1d066d1..1a34605ab6e 100644 --- a/nexus/src/app/instance_network.rs +++ b/nexus/src/app/instance_network.rs @@ -510,7 +510,7 @@ pub(crate) async fn probe_ensure_dpd_config( // Notify dendrite that there are changes for it to reconcile. // In the event of a failure to notify dendrite, we'll log an error // and rely on dendrite's RPW timer to catch it up. - if let Err(e) = dpd_client.ipv4_nat_trigger_update().await { + if let Err(e) = dpd_client.nat_trigger_update().await { error!(log, "failed to notify dendrite of nat updates"; "error" => ?e); }; @@ -642,7 +642,7 @@ pub(crate) async fn probe_delete_dpd_config( // Notify dendrite that there are changes for it to reconcile. // In the event of a failure to notify dendrite, we'll log an error // and rely on dendrite's RPW timer to catch it up. - if let Err(e) = dpd_client.ipv4_nat_trigger_update().await { + if let Err(e) = dpd_client.nat_trigger_update().await { error!(log, "failed to notify dendrite of nat updates"; "error" => ?e); }; } @@ -762,7 +762,7 @@ async fn notify_dendrite_nat_state( // Notify dendrite that there are changes for it to reconcile. // In the event of a failure to notify dendrite, we'll log an error // and rely on dendrite's RPW timer to catch it up. - if let Err(e) = dpd_client.ipv4_nat_trigger_update().await { + if let Err(e) = dpd_client.nat_trigger_update().await { error!(log, "failed to notify dendrite of nat updates"; "error" => ?e); }; } diff --git a/package-manifest.toml b/package-manifest.toml index aa9c5e228e2..713cdd4c5b7 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -736,8 +736,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "ab30fa91227fd478bfe0e023310ca83dec0bc22b" -source.sha256 = "a5361a24136fbf4d61ce73063c4e69dca08c4a017cf1aa469c41b62a2e86f280" +source.commit = "846348bf5c92ab490cf4f69fbe1202691dae6125" +source.sha256 = "676cb71af9c8b7266ea6c789f0293cbd17d1048b5ed5538a36cc4c6cba80e356" output.type = "zone" output.intermediate_only = true @@ -763,8 +763,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "ab30fa91227fd478bfe0e023310ca83dec0bc22b" -source.sha256 = "cca55b7a4995034e4217bddcf97230e18538089162ef413db5e30466b9e2ef8e" +source.commit = "846348bf5c92ab490cf4f69fbe1202691dae6125" +source.sha256 = "1e4d43e73ab68454e5373e23b1b111b66e12b52ae08367979d6e617decd2bb8c" output.type = "zone" output.intermediate_only = true @@ -783,8 +783,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "ab30fa91227fd478bfe0e023310ca83dec0bc22b" -source.sha256 = "272c5b9e927f6c271afb9b9e54a21d14ed0d7d9d319a17c22187fa86a17197ea" +source.commit = "846348bf5c92ab490cf4f69fbe1202691dae6125" +source.sha256 = "63987c847bd4b72e110a858b7dbf48bb9b6a94ce1c377970c7df0d131a2bd8c9" output.type = "zone" output.intermediate_only = true diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums index be676840875..38341cf19a3 100644 --- a/tools/dendrite_stub_checksums +++ b/tools/dendrite_stub_checksums @@ -1,3 +1,3 @@ -CIDL_SHA256_ILLUMOS="a5361a24136fbf4d61ce73063c4e69dca08c4a017cf1aa469c41b62a2e86f280" -CIDL_SHA256_LINUX_DPD="6c914499455477d0e4f9b30c2c2522363b2b8ee8bc11f9ca0b316a0f1b6bc0f2" -CIDL_SHA256_LINUX_SWADM="a178107fe8dfca66eed4190563d9ae563763d62dfcc1f411f4eca1d4330d9c64" +CIDL_SHA256_ILLUMOS="676cb71af9c8b7266ea6c789f0293cbd17d1048b5ed5538a36cc4c6cba80e356" +CIDL_SHA256_LINUX_DPD="f653a229c91d75548a328661ced179aefb1874013bdcc1153210a87e61548a67" +CIDL_SHA256_LINUX_SWADM="9d9fa5b7d4fc2dacf21ecb55853fc731eab1bd3cbac71e63b2ad917d4d6d47c1" diff --git a/tools/dendrite_version b/tools/dendrite_version index a7526dabf5f..e7ee59b1665 100644 --- a/tools/dendrite_version +++ b/tools/dendrite_version @@ -1 +1 @@ -COMMIT="ab30fa91227fd478bfe0e023310ca83dec0bc22b" +COMMIT="846348bf5c92ab490cf4f69fbe1202691dae6125" diff --git a/tools/softnpu_version b/tools/softnpu_version index 03f74d88656..0fc9248f4f1 100644 --- a/tools/softnpu_version +++ b/tools/softnpu_version @@ -1,2 +1,2 @@ -COMMIT="3203c51cf4473d30991b522062ac0df2e045c2f2" -SHA2="36095c7f9d613b9208415aeb67335836a25f72eed2f7a41931ba7d91ddb00568" +COMMIT="e4c3130538b192988737161f4a4dc97272f02b9c" +SHA2="5776bfcd80b685080c383b19b04b46ba9b985de18f722f1523f456d7ce59d0c5"