From c3c0fdad39638f51cd89c49559ad6542de749a8a Mon Sep 17 00:00:00 2001 From: James MacMahon Date: Thu, 21 Apr 2022 09:01:14 -0400 Subject: [PATCH 1/7] update crucible image pull in latest crucible image to grab the volume ownership fix from https://github.com/oxidecomputer/crucible/pull/287 --- package-manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-manifest.toml b/package-manifest.toml index f7512e1a32b..ebabd202e53 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -75,10 +75,10 @@ zone = true # 3. Use type = "manual" instead of the "prebuilt" type = "prebuilt" repo = "crucible" -commit = "aec731421ddbb6f5ec733185b82493bcf62c8011" +commit = "a70d458984acaf6144d36fa79670f97af148e98b" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -sha256 = "c024e5ea6715f43e416e83bbc0327ec166e22886a81dcd9fe5adff36cc327dcc" +sha256 = "d98deec8a019393f627cd3f4c98bd3911b4b734f0d3ac4c57c75578696c0117d" # Refer to # https://github.com/oxidecomputer/propolis/blob/master/package/README.md From 41f695f84bc5d62c7ba9143a51cfcdcab454d458 Mon Sep 17 00:00:00 2001 From: James MacMahon Date: Thu, 21 Apr 2022 11:27:27 -0400 Subject: [PATCH 2/7] update crucible rev in Cargo.toml too --- Cargo.lock | 2 +- nexus/Cargo.toml | 2 +- sled-agent/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2e3406717ac..7596accefa7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -652,7 +652,7 @@ dependencies = [ [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=945daedb88cefa790f1d994b3a038b8fa9ac514a#945daedb88cefa790f1d994b3a038b8fa9ac514a" +source = "git+https://github.com/oxidecomputer/crucible?rev=a70d458984acaf6144d36fa79670f97af148e98b#a70d458984acaf6144d36fa79670f97af148e98b" dependencies = [ "anyhow", "chrono", diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index 57c4cc21782..0e5bdc90485 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -15,7 +15,7 @@ authz-macros = { path = "src/authz/authz-macros" } base64 = "0.13.0" bb8 = "0.8.0" cookie = "0.16" -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945daedb88cefa790f1d994b3a038b8fa9ac514a" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "a70d458984acaf6144d36fa79670f97af148e98b" } # Tracking pending 2.0 version. diesel = { git = "https://github.com/diesel-rs/diesel", rev = "ce77c382", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] } fatfs = "0.3.5" diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index 1891328b1b5..eeb923a1a3e 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -13,7 +13,7 @@ bytes = "1.1" cfg-if = "1.0" chrono = { version = "0.4", features = [ "serde" ] } # Only used by the simulated sled agent. -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945daedb88cefa790f1d994b3a038b8fa9ac514a" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "a70d458984acaf6144d36fa79670f97af148e98b" } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } futures = "0.3.21" ipnetwork = "0.18" From 49858dadc0890847e091a4dd4a6e1fdc0b9b9528 Mon Sep 17 00:00:00 2001 From: James MacMahon Date: Thu, 21 Apr 2022 21:32:26 -0400 Subject: [PATCH 3/7] update propolis cargo rev and image --- package-manifest.toml | 4 ++-- sled-agent/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-manifest.toml b/package-manifest.toml index ebabd202e53..07a8692767f 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -89,7 +89,7 @@ zone = true [external_package.propolis-server.source] type = "prebuilt" repo = "propolis" -commit = "abd372deb0a7dfa33f138f7741c5107184fa7088" +commit = "514fa1fc7740209fcb4b38397b9fe7e6c2df30cb" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -sha256 = "80eb60d7c1eb15d261baeb3a4e9179beff491b5cc20bfb172960e78c5d331b94" +sha256 = "2de46d18505f022d38e12b65a8d0b985bd705c9c8f532d10b79ec909d8b48dde" diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index eeb923a1a3e..97e561358bf 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -23,7 +23,7 @@ omicron-common = { path = "../common" } p256 = "0.9.0" percent-encoding = "2.1.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "abd372deb0a7dfa33f138f7741c5107184fa7088" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "514fa1fc7740209fcb4b38397b9fe7e6c2df30cb" } rand = { version = "0.8.5", features = ["getrandom"] } reqwest = { version = "0.11.8", default-features = false, features = ["rustls-tls", "stream"] } schemars = { version = "0.8", features = [ "chrono", "uuid" ] } From a70c051a81c6bf875c0c77302d5ba4b9fa6ecc64 Mon Sep 17 00:00:00 2001 From: James MacMahon Date: Mon, 25 Apr 2022 10:21:59 -0400 Subject: [PATCH 4/7] crucible from a70d4589 to 257032d1; propolis from 514fa1fc to ec4f3a41 --- Cargo.lock | 27 ++++++++++++++++++--------- Cargo.toml | 6 ++++-- nexus/Cargo.toml | 2 +- package-manifest.toml | 4 ++-- sled-agent/Cargo.toml | 4 ++-- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7596accefa7..3e60fddfd04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -620,7 +620,7 @@ dependencies = [ [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=4090a023b77dcab7a5000057cf2c96cdbb0469b6#4090a023b77dcab7a5000057cf2c96cdbb0469b6" +source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" dependencies = [ "aes-gcm-siv", "anyhow", @@ -647,12 +647,13 @@ dependencies = [ "tracing", "usdt", "uuid", + "version_check", ] [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=a70d458984acaf6144d36fa79670f97af148e98b#a70d458984acaf6144d36fa79670f97af148e98b" +source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" dependencies = [ "anyhow", "chrono", @@ -667,11 +668,11 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=4090a023b77dcab7a5000057cf2c96cdbb0469b6#4090a023b77dcab7a5000057cf2c96cdbb0469b6" +source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" dependencies = [ "anyhow", "rusqlite", - "rustls-pemfile", + "rustls-pemfile 1.0.0", "serde", "serde_json", "tempfile", @@ -685,7 +686,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=4090a023b77dcab7a5000057cf2c96cdbb0469b6#4090a023b77dcab7a5000057cf2c96cdbb0469b6" +source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" dependencies = [ "anyhow", "bincode", @@ -699,7 +700,7 @@ dependencies = [ [[package]] name = "crucible-scope" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=4090a023b77dcab7a5000057cf2c96cdbb0469b6#4090a023b77dcab7a5000057cf2c96cdbb0469b6" +source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" dependencies = [ "anyhow", "futures", @@ -987,7 +988,7 @@ dependencies = [ "percent-encoding", "proc-macro2", "rustls", - "rustls-pemfile", + "rustls-pemfile 0.3.0", "schemars", "serde", "serde_json", @@ -3346,7 +3347,6 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=abd372deb0a7dfa33f138f7741c5107184fa7088#abd372deb0a7dfa33f138f7741c5107184fa7088" dependencies = [ "crucible", "reqwest", @@ -3591,7 +3591,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "rustls-pemfile", + "rustls-pemfile 0.3.0", "serde", "serde_json", "serde_urlencoded", @@ -3706,6 +3706,15 @@ dependencies = [ "base64", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +dependencies = [ + "base64", +] + [[package]] name = "rustversion" version = "1.0.6" diff --git a/Cargo.toml b/Cargo.toml index 3a32c9b2ec0..b9f8c2e9ea3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,9 +74,11 @@ panic = "abort" #dropshot = { path = "../dropshot/dropshot" } #[patch."https://github.com/oxidecomputer/steno"] #steno = { path = "../steno" } -#[patch."https://github.com/oxidecomputer/propolis"] -#propolis-client = { path = "../propolis/client" } +[patch."https://github.com/oxidecomputer/propolis"] +propolis-client = { path = "../propolis/client" } #propolis-server = { path = "../propolis/server" } +#[patch."https://github.com/oxidecomputer/crucible"] +#crucible = { path = "../crucible/upstairs" } # # Local client generation during development. diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index 0e5bdc90485..95957b98ab0 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -15,7 +15,7 @@ authz-macros = { path = "src/authz/authz-macros" } base64 = "0.13.0" bb8 = "0.8.0" cookie = "0.16" -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "a70d458984acaf6144d36fa79670f97af148e98b" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "257032d1e842901d427f344a396d78b9b85b183f" } # Tracking pending 2.0 version. diesel = { git = "https://github.com/diesel-rs/diesel", rev = "ce77c382", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] } fatfs = "0.3.5" diff --git a/package-manifest.toml b/package-manifest.toml index 07a8692767f..692aee05643 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -75,10 +75,10 @@ zone = true # 3. Use type = "manual" instead of the "prebuilt" type = "prebuilt" repo = "crucible" -commit = "a70d458984acaf6144d36fa79670f97af148e98b" +commit = "257032d1e842901d427f344a396d78b9b85b183f" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -sha256 = "d98deec8a019393f627cd3f4c98bd3911b4b734f0d3ac4c57c75578696c0117d" +sha256 = "9f73687e4d883a7277af6655e77026188144ada144e4243c90cc139a9a9df6d7" # Refer to # https://github.com/oxidecomputer/propolis/blob/master/package/README.md diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index 97e561358bf..6848b96991b 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -13,7 +13,7 @@ bytes = "1.1" cfg-if = "1.0" chrono = { version = "0.4", features = [ "serde" ] } # Only used by the simulated sled agent. -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "a70d458984acaf6144d36fa79670f97af148e98b" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "257032d1e842901d427f344a396d78b9b85b183f" } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } futures = "0.3.21" ipnetwork = "0.18" @@ -23,7 +23,7 @@ omicron-common = { path = "../common" } p256 = "0.9.0" percent-encoding = "2.1.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "514fa1fc7740209fcb4b38397b9fe7e6c2df30cb" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" } rand = { version = "0.8.5", features = ["getrandom"] } reqwest = { version = "0.11.8", default-features = false, features = ["rustls-tls", "stream"] } schemars = { version = "0.8", features = [ "chrono", "uuid" ] } From b044e99686cd67445820d9413e9f5b15f378a126 Mon Sep 17 00:00:00 2001 From: James MacMahon Date: Mon, 25 Apr 2022 10:22:39 -0400 Subject: [PATCH 5/7] update to new propolis image --- package-manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-manifest.toml b/package-manifest.toml index 692aee05643..b92c51417c0 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -89,7 +89,7 @@ zone = true [external_package.propolis-server.source] type = "prebuilt" repo = "propolis" -commit = "514fa1fc7740209fcb4b38397b9fe7e6c2df30cb" +commit = "ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -sha256 = "2de46d18505f022d38e12b65a8d0b985bd705c9c8f532d10b79ec909d8b48dde" +sha256 = "fd3ac7cfa6659033051bb29ecc297240c519c5db339045f17ecccf594a266811" From 86d04433544dccd3f03e323a44cdcdd478b5d836 Mon Sep 17 00:00:00 2001 From: James MacMahon Date: Mon, 25 Apr 2022 10:27:39 -0400 Subject: [PATCH 6/7] oops, committed patch --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b9f8c2e9ea3..e30d6ce36bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,8 +74,8 @@ panic = "abort" #dropshot = { path = "../dropshot/dropshot" } #[patch."https://github.com/oxidecomputer/steno"] #steno = { path = "../steno" } -[patch."https://github.com/oxidecomputer/propolis"] -propolis-client = { path = "../propolis/client" } +#[patch."https://github.com/oxidecomputer/propolis"] +#propolis-client = { path = "../propolis/client" } #propolis-server = { path = "../propolis/server" } #[patch."https://github.com/oxidecomputer/crucible"] #crucible = { path = "../crucible/upstairs" } From 841d78f92703ad1b605ada5e4881a871662de61c Mon Sep 17 00:00:00 2001 From: James MacMahon Date: Mon, 25 Apr 2022 10:34:54 -0400 Subject: [PATCH 7/7] update Cargo.lock --- Cargo.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.lock b/Cargo.lock index 3e60fddfd04..4572361e006 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3347,6 +3347,7 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" +source = "git+https://github.com/oxidecomputer/propolis?rev=ec4f3a41a638ea6c3316a86f30f1895f4877f2ef#ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" dependencies = [ "crucible", "reqwest",