From 165d42a15ef095fe530b4b4767a3821a9a1a0b71 Mon Sep 17 00:00:00 2001 From: Benjamin Naecker Date: Tue, 3 Sep 2024 10:40:04 -0700 Subject: [PATCH] Update Crucible and Propolis (#6453) Co-authored-by: Benjamin Naecker --- Cargo.lock | 30 +++++++++++++++--------------- Cargo.toml | 12 ++++++------ package-manifest.toml | 16 ++++++++-------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d9524a6df9..2142b1c923 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1542,7 +1542,7 @@ dependencies = [ [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=eab46702b6a43ff558672462dea3eb5ff7b8a0e6#eab46702b6a43ff558672462dea3eb5ff7b8a0e6" +source = "git+https://github.com/oxidecomputer/crucible?rev=b026dd82779eb2c2f87164e30feb7dd7f4b6e677#b026dd82779eb2c2f87164e30feb7dd7f4b6e677" dependencies = [ "anyhow", "chrono", @@ -1558,7 +1558,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=eab46702b6a43ff558672462dea3eb5ff7b8a0e6#eab46702b6a43ff558672462dea3eb5ff7b8a0e6" +source = "git+https://github.com/oxidecomputer/crucible?rev=b026dd82779eb2c2f87164e30feb7dd7f4b6e677#b026dd82779eb2c2f87164e30feb7dd7f4b6e677" dependencies = [ "anyhow", "atty", @@ -1588,7 +1588,7 @@ dependencies = [ [[package]] name = "crucible-pantry-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=eab46702b6a43ff558672462dea3eb5ff7b8a0e6#eab46702b6a43ff558672462dea3eb5ff7b8a0e6" +source = "git+https://github.com/oxidecomputer/crucible?rev=b026dd82779eb2c2f87164e30feb7dd7f4b6e677#b026dd82779eb2c2f87164e30feb7dd7f4b6e677" dependencies = [ "anyhow", "chrono", @@ -1605,7 +1605,7 @@ dependencies = [ [[package]] name = "crucible-smf" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=eab46702b6a43ff558672462dea3eb5ff7b8a0e6#eab46702b6a43ff558672462dea3eb5ff7b8a0e6" +source = "git+https://github.com/oxidecomputer/crucible?rev=b026dd82779eb2c2f87164e30feb7dd7f4b6e677#b026dd82779eb2c2f87164e30feb7dd7f4b6e677" dependencies = [ "crucible-workspace-hack", "libc", @@ -6252,7 +6252,7 @@ dependencies = [ "pq-sys", "pretty_assertions", "progenitor-client", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=d45b4898137762074b7f7435b64fd2ccf41f4138)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad)", "rand", "rcgen", "ref-cast", @@ -6507,7 +6507,7 @@ dependencies = [ "oximeter-producer", "oxnet", "pretty_assertions", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=d45b4898137762074b7f7435b64fd2ccf41f4138)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad)", "propolis-mock-server", "rand", "rcgen", @@ -8113,7 +8113,7 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af" +source = "git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad#5267be82e10d851a64196a8148893691b0b9f8ad" dependencies = [ "async-trait", "base64 0.21.7", @@ -8127,14 +8127,14 @@ dependencies = [ "slog", "thiserror", "tokio", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite 0.21.0", "uuid", ] [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=d45b4898137762074b7f7435b64fd2ccf41f4138#d45b4898137762074b7f7435b64fd2ccf41f4138" +source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af" dependencies = [ "async-trait", "base64 0.21.7", @@ -8148,14 +8148,14 @@ dependencies = [ "slog", "thiserror", "tokio", - "tokio-tungstenite 0.21.0", + "tokio-tungstenite 0.20.1", "uuid", ] [[package]] name = "propolis-mock-server" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=d45b4898137762074b7f7435b64fd2ccf41f4138#d45b4898137762074b7f7435b64fd2ccf41f4138" +source = "git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad#5267be82e10d851a64196a8148893691b0b9f8ad" dependencies = [ "anyhow", "atty", @@ -8165,7 +8165,7 @@ dependencies = [ "futures", "hyper 0.14.30", "progenitor", - "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=d45b4898137762074b7f7435b64fd2ccf41f4138)", + "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad)", "rand", "reqwest", "schemars", @@ -8197,7 +8197,7 @@ dependencies = [ [[package]] name = "propolis_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af" +source = "git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad#5267be82e10d851a64196a8148893691b0b9f8ad" dependencies = [ "schemars", "serde", @@ -8206,7 +8206,7 @@ dependencies = [ [[package]] name = "propolis_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=d45b4898137762074b7f7435b64fd2ccf41f4138#d45b4898137762074b7f7435b64fd2ccf41f4138" +source = "git+https://github.com/oxidecomputer/propolis?rev=6dceb9ef69c217cb78a2018bbedafbc19f6ec1af#6dceb9ef69c217cb78a2018bbedafbc19f6ec1af" dependencies = [ "schemars", "serde", @@ -9751,7 +9751,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "oxnet", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=d45b4898137762074b7f7435b64fd2ccf41f4138)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=5267be82e10d851a64196a8148893691b0b9f8ad)", "rcgen", "schemars", "serde", diff --git a/Cargo.toml b/Cargo.toml index 33098f0670..29791013ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -323,10 +323,10 @@ cookie = "0.18" criterion = { version = "0.5.1", features = [ "async_tokio" ] } crossbeam = "0.8" crossterm = { version = "0.28.1", features = ["event-stream"] } -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"} -crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"} -crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"} -crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"} +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"} +crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"} +crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"} +crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"} csv = "1.3.0" curve25519-dalek = "4" datatest-stable = "0.2.9" @@ -503,8 +503,8 @@ proc-macro2 = "1.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" } progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" } bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "d45b4898137762074b7f7435b64fd2ccf41f4138" } -propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "d45b4898137762074b7f7435b64fd2ccf41f4138" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "5267be82e10d851a64196a8148893691b0b9f8ad" } +propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "5267be82e10d851a64196a8148893691b0b9f8ad" } proptest = "1.5.0" qorb = { git = "https://github.com/oxidecomputer/qorb", branch = "master" } quote = "1.0" diff --git a/package-manifest.toml b/package-manifest.toml index ec5c14dab2..c549f62c81 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -569,10 +569,10 @@ only_for_targets.image = "standard" # 3. Use source.type = "manual" instead of "prebuilt" source.type = "prebuilt" source.repo = "crucible" -source.commit = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6" +source.commit = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -source.sha256 = "fbc1482e41c92120cc79611fe7774752f1ed2ecef17a8adcd00ab4099f08821f" +source.sha256 = "9a77eda6314efd1780ff2ee25c28c6401f3e7f2592bf73b09993cee8ac863168" output.type = "zone" output.intermediate_only = true @@ -581,10 +581,10 @@ service_name = "crucible_pantry_prebuilt" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6" +source.commit = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-pantry.sha256.txt -source.sha256 = "7c7ea8cd3895687e3bdae2eef6dce57f11c937ce0c52bd6779c897cb6462d387" +source.sha256 = "84f3bc041aedfcbf2162a6dd022446c3af707acd91b1c4e98c8cd45f469d5ce2" output.type = "zone" output.intermediate_only = true @@ -598,10 +598,10 @@ service_name = "crucible_dtrace" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6" +source.commit = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-dtrace.sha256.txt -source.sha256 = "983a6b8a0add7dc19c8dde1e0675a5fe160dc92b25cae5817d4664a7a1aff18f" +source.sha256 = "bdec4bc5a15d417c1e203f547c798c03442f5be753cd0361f6e6a939630ad1c3" output.type = "tarball" # Refer to @@ -612,10 +612,10 @@ service_name = "propolis-server" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "propolis" -source.commit = "d45b4898137762074b7f7435b64fd2ccf41f4138" +source.commit = "5267be82e10d851a64196a8148893691b0b9f8ad" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -source.sha256 = "123b16bed8269c9fec93f462e8284567b86f42230401c7dec8fe68c63a811950" +source.sha256 = "e16c961b60d3946cce2052622eac053aea683b2f47f7dc25e07286d83b1907a9" output.type = "zone" [package.mg-ddm-gz]