Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
af09cdd
Update Propolis and Crucible
Sep 23, 2025
d272063
cargo hakari
Sep 23, 2025
628c84d
(7/N) Use nexus_generation, update it (#8936)
smklein Sep 23, 2025
2cb7a2c
[5/n] [reconfigurator-planning] gate adds/updates on zone image sourc…
sunshowers Sep 23, 2025
0f4d4c8
PlanningReport: Remove `blueprint_id` (#9052)
jgallagher Sep 23, 2025
3870c8e
[1/n] create a nexus-lockstep service (#8983)
iliana Sep 23, 2025
c9f2bfc
[2/n] move instance_migrate and APIs used by tests/omdb from nexus-in…
iliana Sep 24, 2025
e470fb8
Complete `target-release` test simulating an entire update (#9059)
jgallagher Sep 24, 2025
83b88da
[planner] Identify when zone update is blocked on inventory (#9063)
smklein Sep 24, 2025
e295ba3
internal/external DNS should only contain records for active Nexus in…
davepacheco Sep 24, 2025
eafd242
TQ: Add protocol support for LRTQ upgrade (#9065)
andrewjstone Sep 24, 2025
4de66e9
bump to v17; API version to planned release date (#8907)
iliana Sep 24, 2025
7f724c3
[reconfigurator-planning] allow adding zones if target release genera…
sunshowers Sep 24, 2025
19b9f16
[nexus] Auto-update schema on boot (#9030)
smklein Sep 24, 2025
ef614ba
fix nexus-lockstep semantic merge conflict, #9037 vs #9063 (#9077)
iliana Sep 24, 2025
c6e0b77
PlanningReport: Use JSON-safe map keys (#9080)
jgallagher Sep 24, 2025
092f52f
[reconfigurator-planning] clear remove-mupdate-override from blueprin…
sunshowers Sep 24, 2025
095d7ec
Ignore build metadata when comparing system versions (#9072)
jgallagher Sep 25, 2025
0bbde3d
Merge branch 'main' into alan/crucible-update-propolis
Sep 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 40 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,10 @@ crossterm = { version = "0.29.0", features = ["event-stream"] }
# NOTE: if you change the pinned revision of the `crucible` dependencies, you
# must also update the references in package-manifest.toml to match the new
# revision.
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "779775d5130ff7a4836f52f48b7e64d1479ee104" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "779775d5130ff7a4836f52f48b7e64d1479ee104" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "779775d5130ff7a4836f52f48b7e64d1479ee104" }
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "779775d5130ff7a4836f52f48b7e64d1479ee104" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" }
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" }
# NOTE: See above!
csv = "1.3.1"
curve25519-dalek = "4"
Expand Down Expand Up @@ -643,10 +643,10 @@ progenitor-client = "0.10.0"
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
# dependencies, you must also update the references in package-manifest.toml to
# match the new revision.
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "23b06c2f452a97fac1dc12561d8451ce876d7c5a" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "23b06c2f452a97fac1dc12561d8451ce876d7c5a" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "23b06c2f452a97fac1dc12561d8451ce876d7c5a" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "23b06c2f452a97fac1dc12561d8451ce876d7c5a" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" }
# NOTE: see above!
proptest = "1.7.0"
qorb = "0.4.1"
Expand Down
16 changes: 8 additions & 8 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -594,10 +594,10 @@ only_for_targets.image = "standard"
# 3. Use source.type = "manual" instead of "prebuilt"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "779775d5130ff7a4836f52f48b7e64d1479ee104"
source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
source.sha256 = "1b393ceb5685700e26da0b6b71bcb869e7456bd33bbfdf4afe2ea5899e77a1fa"
source.sha256 = "7a19eda420ebd1126a25746c2198ed58a62647c755a375c746e84351e651b278"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -606,10 +606,10 @@ service_name = "crucible_pantry_prebuilt"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "779775d5130ff7a4836f52f48b7e64d1479ee104"
source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
source.sha256 = "440da1e2c63c331bfa9e694bcc452c3bb55a915151eac022e7d810e99761aead"
source.sha256 = "e5dcf53aac3ddb5060663d2950837b3c4c81c68ede23b4ff5b1778cd1d4fb51e"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -623,10 +623,10 @@ service_name = "crucible_dtrace"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "779775d5130ff7a4836f52f48b7e64d1479ee104"
source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
source.sha256 = "a3d429399d30b2f26f8194ebfa47df1191c684c4cf8cfbb3be18fa79556d3d10"
source.sha256 = "4ec3f612b0c10ef3372e22e99ef8170ab39d198f394b0e51d6c1065dc7d01b40"
output.type = "tarball"

# Refer to
Expand All @@ -637,10 +637,10 @@ service_name = "propolis-server"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "propolis"
source.commit = "23b06c2f452a97fac1dc12561d8451ce876d7c5a"
source.commit = "827e6615bfebfd94d41504dcd1517a0f22e3166a"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
source.sha256 = "ef5800987f38818f98942a1a6a3864858f81a258ca71cb5f908742a87d7a98e4"
source.sha256 = "242ecfab2c992a4587d19c19a1ad36338305a15af418233dcde231c614ccc2bc"
output.type = "zone"

[package.mg-ddm-gz]
Expand Down
2 changes: 2 additions & 0 deletions workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ url = { version = "2.5.4", features = ["serde"] }
usdt = { version = "0.5.0" }
usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
uuid = { version = "1.18.1", features = ["serde", "v4"] }
vergen = { version = "9.0.6", features = ["cargo", "rustc"] }
vergen-lib = { version = "0.1.6", features = ["cargo", "git", "rustc"] }
winnow-ca01ad9e24f5d932 = { package = "winnow", version = "0.7.10" }
x509-cert = { version = "0.2.5" }
zerocopy-c38e5c1d305a1b54 = { package = "zerocopy", version = "0.8.26", default-features = false, features = ["derive", "simd"] }
Expand Down
Loading