Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
650865f
use daft in more update-related types
davepacheco Apr 15, 2025
f69c0b9
also update this inventory type
davepacheco Apr 15, 2025
6e85921
add information about SP-related updates to blueprint
davepacheco Apr 15, 2025
fb40bc9
missed some
davepacheco Apr 15, 2025
a5307d3
execution driver for SP updates
davepacheco Apr 15, 2025
693245f
fix clippy
davepacheco Apr 15, 2025
05061cd
incorporate MgsUpdateDriver into blueprint execution
davepacheco Apr 15, 2025
6b66dfe
fix tests
davepacheco Apr 15, 2025
d7dfcef
Merge branch 'dap/sp-blueprint' into dap/mgs-updater
davepacheco Apr 15, 2025
e9f1720
this can manifest a different way
davepacheco Apr 15, 2025
5e30d4a
Merge branch 'dap/mgs-updater' into dap/sp-update-execution
davepacheco Apr 15, 2025
0889ee1
Merge branch 'main' into dap/sp-blueprint
davepacheco Apr 15, 2025
244c42b
use IdMap instead
davepacheco Apr 15, 2025
48f42a3
Merge branch 'main' into dap/sp-blueprint
davepacheco Apr 15, 2025
f29f33f
reference issue
davepacheco Apr 15, 2025
45b475b
Merge branch 'dap/sp-blueprint' into dap/mgs-updater
davepacheco Apr 15, 2025
fdd173f
fixes for changes in dependent PR
davepacheco Apr 15, 2025
bc057db
Merge branch 'dap/mgs-updater' into dap/sp-update-execution
davepacheco Apr 15, 2025
2b3f39e
use IdMap
davepacheco Apr 15, 2025
81bfe4b
review feedback: document cancel-safety, clean up status lifetime
davepacheco Apr 15, 2025
24810fd
sundry review feedback
davepacheco Apr 15, 2025
0b535cb
Merge branch 'dap/mgs-updater' into dap/sp-update-execution
davepacheco Apr 15, 2025
15aa85a
fix api
davepacheco Apr 15, 2025
3728cf3
Merge branch 'dap/sp-blueprint' into dap/mgs-updater
davepacheco Apr 15, 2025
360e138
Merge branch 'dap/mgs-updater' into dap/sp-update-execution
davepacheco Apr 15, 2025
31417de
update API dependencies
davepacheco Apr 16, 2025
e574c82
fix test
davepacheco Apr 16, 2025
93a6166
Merge branch 'dap/sp-blueprint' into dap/mgs-updater
davepacheco Apr 16, 2025
f9f5d16
Merge branch 'dap/mgs-updater' into dap/sp-update-execution
davepacheco Apr 16, 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
45 changes: 45 additions & 0 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ members = [
"dev-tools/pins",
"dev-tools/reconfigurator-cli",
"dev-tools/reconfigurator-exec-unsafe",
"dev-tools/reconfigurator-sp-updater",
"dev-tools/releng",
"dev-tools/repl-utils",
"dev-tools/repo-depot-standalone",
Expand Down Expand Up @@ -188,6 +189,7 @@ default-members = [
"dev-tools/pins",
"dev-tools/reconfigurator-cli",
"dev-tools/reconfigurator-exec-unsafe",
"dev-tools/reconfigurator-sp-updater",
"dev-tools/releng",
"dev-tools/repl-utils",
"dev-tools/repo-depot-standalone",
Expand Down Expand Up @@ -688,7 +690,7 @@ tokio = "1.43.0"
tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
tokio-stream = "0.1.17"
tokio-tungstenite = "0.23.1"
tokio-util = { version = "0.7.13", features = ["io", "io-util"] }
tokio-util = { version = "0.7.13", features = ["io", "io-util", "time"] }
toml = "0.8.20"
toml_edit = "0.22.24"
tough = { version = "0.20.0", features = [ "http" ] }
Expand Down
3 changes: 2 additions & 1 deletion dev-tools/ls-apis/tests/api_dependencies.out
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ereport (client: ereport-client)

Management Gateway Service (client: gateway-client)
consumed by: dpd (dendrite/dpd) via 1 path
consumed by: omicron-nexus (omicron/nexus) via 3 paths
consumed by: omicron-nexus (omicron/nexus) via 4 paths
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
consumed by: wicketd (omicron/wicketd) via 3 paths

Expand Down Expand Up @@ -83,6 +83,7 @@ Crucible Repair (client: repair-client)
consumed by: crucible-downstairs (crucible/downstairs) via 1 path

Repo Depot API (client: repo-depot-client)
consumed by: omicron-nexus (omicron/nexus) via 1 path
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path

Sled Agent (client: sled-agent-client)
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/omdb/tests/successes.out
Original file line number Diff line number Diff line change
Expand Up @@ -1423,6 +1423,7 @@ parent: <none>
internal DNS version: 1
external DNS version: 2

PENDING MGS-MANAGED UPDATES: 0

---------------------------------------------
stderr:
Expand Down Expand Up @@ -1519,6 +1520,7 @@ parent: <none>
internal DNS version: 1
external DNS version: 2

PENDING MGS-MANAGED UPDATES: 0

---------------------------------------------
stderr:
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


>
Expand Down Expand Up @@ -453,5 +454,6 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 9995de32-dd52-4eb1-b0eb-141eb84bc739
Expand Down Expand Up @@ -605,6 +606,7 @@ parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-plan 366b0b68-d80e-4bc1-abd3-dc69837847e0
Expand Down Expand Up @@ -922,6 +924,7 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone d786ef4a-5acb-4f5d-a732-a00addf986b5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ parent: 1b013011-2062-4b48-b544-a32b23bce83a
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


>
Expand Down Expand Up @@ -198,6 +199,7 @@ parent: 9766ca20-38d4-4380-b005-e7c43c797e7c
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-diff 971eeb12-1830-4fa0-a699-98ea0164505c f714e6ea-e85a-4d7d-93c2-a018744fe176
Expand Down Expand Up @@ -470,6 +472,7 @@ parent: bb128f06-a2e1-44c1-8874-4f789d0ff896
internal DNS version: 1
external DNS version: 1

PENDING MGS-MANAGED UPDATES: 0


> blueprint-diff f714e6ea-e85a-4d7d-93c2-a018744fe176 d9c572a1-a68c-4945-b1ec-5389bd588fe9
Expand Down
5 changes: 5 additions & 0 deletions dev-tools/reconfigurator-exec-unsafe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@ camino.workspace = true
clap.workspace = true
dropshot.workspace = true
internal-dns-resolver.workspace = true
internal-dns-types.workspace = true
nexus-db-model.workspace = true
nexus-db-queries.workspace = true
nexus-mgs-updates.workspace = true
nexus-reconfigurator-execution.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-uuid-kinds.workspace = true
# See omicron-rpaths for more about the "pq-sys" dependency.
pq-sys = "*"
qorb.workspace = true
repo-depot-client.workspace = true
serde_json.workspace = true
slog.workspace = true
supports-color.workspace = true
Expand Down
Loading
Loading