Skip to content

Commit ff24290

Browse files
authored
Update dendrite, lldpd, maghemite, and sidecar-lite to get ipv6 ecmp (#8987)
1 parent 1fb71d1 commit ff24290

File tree

11 files changed

+208
-93
lines changed

11 files changed

+208
-93
lines changed

Cargo.lock

Lines changed: 173 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ digest = "0.10.7"
432432
dns-server = { path = "dns-server" }
433433
dns-server-api = { path = "dns-server-api" }
434434
dns-service-client = { path = "clients/dns-service-client" }
435-
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "8314881e372d7bbb4a4ee2da051ecdc34f66c534" }
436-
dropshot = { version = "0.16.4", features = [ "usdt-probes" ] }
435+
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "738c80d18d5e94eda367440ade7743e9d9f124de" }
436+
dropshot = { version = "0.16.3", features = [ "usdt-probes" ] }
437437
dyn-clone = "1.0.20"
438438
either = "1.15.0"
439439
ereport-types = { path = "ereport/types" }
@@ -528,8 +528,8 @@ newtype_derive = "0.1.6"
528528
ntp-admin-api = { path = "ntp-admin/api" }
529529
ntp-admin-client = { path = "clients/ntp-admin-client" }
530530
ntp-admin-types = { path = "ntp-admin/types" }
531-
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "fa5f15cdcd5864161a929e2ec01534f70dfba216" }
532-
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "fa5f15cdcd5864161a929e2ec01534f70dfba216" }
531+
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "e5f53eacc5ab1015c4cd7298912657521a6b8351" }
532+
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "e5f53eacc5ab1015c4cd7298912657521a6b8351" }
533533
multimap = "0.10.1"
534534
nexus-auth = { path = "nexus/auth" }
535535
nexus-background-task-interface = { path = "nexus/background-task-interface" }

dev-tools/ls-apis/tests/api_dependencies.out

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ Clickhouse Single-Node Cluster Admin (client: clickhouse-admin-single-client)
1212
consumed by: omicron-nexus (omicron/nexus) via 2 paths
1313

1414
CockroachDB Cluster Admin (client: cockroach-admin-client)
15+
consumed by: dpd (dendrite/dpd) via 1 path
1516
consumed by: omicron-nexus (omicron/nexus) via 3 paths
1617
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
18+
consumed by: tfportd (dendrite/tfportd) via 1 path
1719

1820
Crucible Agent (client: crucible-agent-client)
1921
consumed by: omicron-nexus (omicron/nexus) via 1 path
@@ -39,7 +41,7 @@ Dendrite DPD (client: dpd-client)
3941
consumed by: mgd (maghemite/mgd) via 1 path
4042
consumed by: omicron-nexus (omicron/nexus) via 2 paths
4143
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
42-
consumed by: tfportd (dendrite/tfportd) via 1 path
44+
consumed by: tfportd (dendrite/tfportd) via 2 paths
4345
consumed by: wicketd (omicron/wicketd) via 2 paths
4446

4547
Downstairs Controller (debugging only) (client: dsc-client)

dev-tools/xtask/src/virtual_hardware.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const ZPOOL: &'static str = "/usr/sbin/zpool";
117117
const ZONEADM: &'static str = "/usr/sbin/zoneadm";
118118

119119
const SIDECAR_LITE_COMMIT: &'static str =
120-
"9499681efa8cdbffe807e6b40bf9211d0d2c21aa";
120+
"a95b7a9f78c08125f4e34106f5c885c7e9f2e8d5";
121121
const SOFTNPU_COMMIT: &'static str = "3203c51cf4473d30991b522062ac0df2e045c2f2";
122122
const PXA_MAC_DEFAULT: &'static str = "a8:e1:de:01:70:1d";
123123

package-manifest.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -653,10 +653,10 @@ source.repo = "maghemite"
653653
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
654654
# building `ddm-admin-client` (which will instruct you to update
655655
# `tools/maghemite_openapi_version`).
656-
source.commit = "fa5f15cdcd5864161a929e2ec01534f70dfba216"
656+
source.commit = "e5f53eacc5ab1015c4cd7298912657521a6b8351"
657657
# The SHA256 digest is automatically posted to:
658658
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm-gz.sha256.txt
659-
source.sha256 = "9700900c62394b0858dbd4c12ac23039bed24cae8782e5153f8dfe707589c182"
659+
source.sha256 = "0743e486c7c4183794c0b4f321f6ce7169fc95753f0c9240e407fd64f949ab38"
660660
output.type = "tarball"
661661

662662
[package.mg-ddm]
@@ -669,10 +669,10 @@ source.repo = "maghemite"
669669
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
670670
# building `ddm-admin-client` (which will instruct you to update
671671
# `tools/maghemite_openapi_version`).
672-
source.commit = "fa5f15cdcd5864161a929e2ec01534f70dfba216"
672+
source.commit = "e5f53eacc5ab1015c4cd7298912657521a6b8351"
673673
# The SHA256 digest is automatically posted to:
674674
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
675-
source.sha256 = "2a2b15b22b0c7604c4e5692af24515511084f2dbb17e27af4328bb4e0a8a441e"
675+
source.sha256 = "a1af0c959e532b78137c4466b9242c2583f753b942d92708783fafe5f937643b"
676676
output.type = "zone"
677677
output.intermediate_only = true
678678

@@ -684,19 +684,19 @@ source.repo = "maghemite"
684684
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
685685
# building `ddm-admin-client` (which will instruct you to update
686686
# `tools/maghemite_openapi_version`).
687-
source.commit = "fa5f15cdcd5864161a929e2ec01534f70dfba216"
687+
source.commit = "e5f53eacc5ab1015c4cd7298912657521a6b8351"
688688
# The SHA256 digest is automatically posted to:
689689
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mgd.sha256.txt
690-
source.sha256 = "b18be967a805bf4c0bf872d152ae2f58972c4f3c173a7c0f33c2475a011f1dd1"
690+
source.sha256 = "2281f14eda20b97a1933aaf7bba8cc07e6b65da39d6dc62ce210f9601fcc3396"
691691
output.type = "zone"
692692
output.intermediate_only = true
693693

694694
[package.lldp]
695695
service_name = "lldp"
696696
source.type = "prebuilt"
697697
source.repo = "lldp"
698-
source.commit = "82fbc8c9747eb9f74dde0f92ae77ec67f65652c4"
699-
source.sha256 = "59050782fa238bcf3c1234ac8262300db9eb98823c76a2188bff2994f3779857"
698+
source.commit = "53f4254b1ce7f13e23fdb54180015760b5f44d55"
699+
source.sha256 = "8ef356ec9ca4d261c35d6051d087d17e8757778114eb314d7a011e0927b006cd"
700700
output.type = "zone"
701701
output.intermediate_only = true
702702

@@ -735,8 +735,8 @@ only_for_targets.image = "standard"
735735
# the other `source.*` keys.
736736
source.type = "prebuilt"
737737
source.repo = "dendrite"
738-
source.commit = "8314881e372d7bbb4a4ee2da051ecdc34f66c534"
739-
source.sha256 = "33c702ec73d48854e75eeda60e75be57c628dc6b3cc70ae341af0b4b9a99e1b8"
738+
source.commit = "738c80d18d5e94eda367440ade7743e9d9f124de"
739+
source.sha256 = "cc78c4fa4f863df62eda1f90175f3a7ffe1b34b7bb6a95bed869c2df5e6c4a08"
740740
output.type = "zone"
741741
output.intermediate_only = true
742742

@@ -762,8 +762,8 @@ only_for_targets.image = "standard"
762762
# the other `source.*` keys.
763763
source.type = "prebuilt"
764764
source.repo = "dendrite"
765-
source.commit = "8314881e372d7bbb4a4ee2da051ecdc34f66c534"
766-
source.sha256 = "05543cffe604f8caccf8f3e223b2ee404620f3adc3dd4812e30fd2f5a92f6010"
765+
source.commit = "738c80d18d5e94eda367440ade7743e9d9f124de"
766+
source.sha256 = "55376e97f2b5695475275f78b8b3d2c8bad1100df13a75746fe82ad43e786082"
767767
output.type = "zone"
768768
output.intermediate_only = true
769769

@@ -782,8 +782,8 @@ only_for_targets.image = "standard"
782782
# the other `source.*` keys.
783783
source.type = "prebuilt"
784784
source.repo = "dendrite"
785-
source.commit = "8314881e372d7bbb4a4ee2da051ecdc34f66c534"
786-
source.sha256 = "e57e5cfaadb451c786d94665ae91459d46412541fedcb3d3903766191fdfd2f0"
785+
source.commit = "738c80d18d5e94eda367440ade7743e9d9f124de"
786+
source.sha256 = "f2d3f38100fd49fff3884512ecfeb92c4a1d079de2c862b869c8aa83c75ba640"
787787
output.type = "zone"
788788
output.intermediate_only = true
789789

tools/dendrite_stub_checksums

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
CIDL_SHA256_ILLUMOS="33c702ec73d48854e75eeda60e75be57c628dc6b3cc70ae341af0b4b9a99e1b8"
2-
CIDL_SHA256_LINUX_DPD="670809a9cd9112a4603c71df6ecd894fa777b3ed9cf8055582aab8e5b33ac157"
3-
CIDL_SHA256_LINUX_SWADM="3cc3fd488b7134b3e36507000d79d04d7524e0e0b0af3e0bf950fd5b4f605713"
1+
CIDL_SHA256_ILLUMOS="cc78c4fa4f863df62eda1f90175f3a7ffe1b34b7bb6a95bed869c2df5e6c4a08"
2+
CIDL_SHA256_LINUX_DPD="c806645b8bfa2b605c4cb48c33a7470ba91c82696df59738518087f92f4bb2e0"
3+
CIDL_SHA256_LINUX_SWADM="d59294cd4094c10c50341bf94deebccf91376a7e377c5a3b0113344b8841510a"

tools/dendrite_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
COMMIT="8314881e372d7bbb4a4ee2da051ecdc34f66c534"
1+
COMMIT="738c80d18d5e94eda367440ade7743e9d9f124de"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
COMMIT="fa5f15cdcd5864161a929e2ec01534f70dfba216"
1+
COMMIT="e5f53eacc5ab1015c4cd7298912657521a6b8351"
22
SHA2="9146aaf60a52ecd138139708e4019e4496f330fb81a2c5a7a70cd3436a6a1318"

tools/maghemite_mg_openapi_version

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
COMMIT="fa5f15cdcd5864161a929e2ec01534f70dfba216"
2-
SHA2="7af1675e2e93e395185f8d3676db972db0123714c4c5640608f3e3570f3ce3a8"
1+
COMMIT="e5f53eacc5ab1015c4cd7298912657521a6b8351"
2+
SHA2="3d68b221bd0a72cf87195a8a4c8ae408daadf50763349606b9df8186b2d6fe9a"

tools/maghemite_mgd_checksums

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
CIDL_SHA256="b18be967a805bf4c0bf872d152ae2f58972c4f3c173a7c0f33c2475a011f1dd1"
2-
MGD_LINUX_SHA256="898bda7698ce594962b61e7c1b637f0f5ad843c1ab60eb5846fe1afdb84be8df"
1+
CIDL_SHA256="2281f14eda20b97a1933aaf7bba8cc07e6b65da39d6dc62ce210f9601fcc3396"
2+
MGD_LINUX_SHA256="a7f483807db3b1f98ceece73e126f09ae8c3b47f4fab1a303b74819caea64c73"

0 commit comments

Comments
 (0)