Merge main into internal-dns-self-assembling-zone

.github/buildomat/jobs/deploy.sh

@@ -161,7 +161,7 @@ cd /opt/oxide/work
 
 ptime -m tar xvzf /input/package/work/package.tar.gz
 cp /input/package/work/zones/* out/
-mv out/omicron-nexus-single-sled.tar.gz out/omicron-nexus.tar.gz
+mv out/nexus-single-sled.tar.gz out/nexus.tar.gz
 mkdir tests
 for p in /input/ci-tools/work/end-to-end-tests/*.gz; do
 	ptime -m gunzip < "$p" > "tests/$(basename "${p%.gz}")"

.github/buildomat/jobs/package.sh

@@ -84,7 +84,7 @@ stamp_packages() {
 
 # Keep the single-sled Nexus zone around for the deploy job. (The global zone
 # build below overwrites the file.)
-mv out/omicron-nexus.tar.gz out/omicron-nexus-single-sled.tar.gz
+mv out/nexus.tar.gz out/nexus-single-sled.tar.gz
 
 # Build necessary for the global zone
 ptime -m cargo run --locked --release --bin omicron-package -- \
@@ -115,8 +115,8 @@ zones=(
   out/crucible-zone.tar.gz
   out/external-dns.tar.gz
   out/internal-dns.tar.gz
-  out/omicron-nexus.tar.gz
-  out/omicron-nexus-single-sled.tar.gz
+  out/nexus.tar.gz
+  out/nexus-single-sled.tar.gz
   out/oximeter.tar.gz
   out/propolis-server.tar.gz
   out/switch-*.tar.gz

.github/buildomat/jobs/tuf-repo.sh

@@ -93,7 +93,7 @@ target/release/omicron-package -t default target create -i standard -m gimlet -s
 ln -s /input/package/work/zones/* out/
 rm out/switch-softnpu.tar.gz  # not used when target switch=asic
 rm out/omicron-gateway-softnpu.tar.gz  # not used when target switch=asic
-rm out/omicron-nexus-single-sled.tar.gz # only used for deploy tests
+rm out/nexus-single-sled.tar.gz # only used for deploy tests
 for zone in out/*.tar.gz; do
     target/release/omicron-package stamp "$(basename "${zone%.tar.gz}")" "$VERSION"
 done

Cargo.toml

@@ -225,7 +225,7 @@ hex = "0.4.3"
 hex-literal = "0.4.1"
 highway = "1.1.0"
 hkdf = "0.12.4"
-http = "0.2.11"
+http = "0.2.12"
 httptest = "0.15.5"
 hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" }
 humantime = "2.1.0"
@@ -336,7 +336,7 @@ rpassword = "7.3.1"
 rstest = "0.18.2"
 rustfmt-wrapper = "0.2"
 rustls = "0.22.2"
-rustls-pemfile = "2.1.0"
+rustls-pemfile = "2.1.1"
 rustyline = "13.0.0"
 samael = { version = "0.0.14", features = ["xmlsec"] }
 schemars = "0.8.16"

illumos-utils/src/running_zone.rs

@@ -404,7 +404,7 @@ impl RunningZone {
 
     /// Returns the filesystem path to the zone's root in the GZ.
     pub fn root(&self) -> Utf8PathBuf {
-        self.inner.zonepath.join(Self::ROOT_FS_PATH)
+        self.inner.root()
     }
 
     pub fn control_interface(&self) -> AddrObject {
@@ -1094,6 +1094,9 @@ pub struct InstalledZone {
 }
 
 impl InstalledZone {
+    /// The path to the zone's root filesystem (i.e., `/`), within zonepath.
+    pub const ROOT_FS_PATH: &'static str = "root";
+
     /// Returns the name of a zone, based on the base zone name plus any unique
     /// identifying info.
     ///
@@ -1135,6 +1138,11 @@ impl InstalledZone {
     pub fn opte_ports(&self) -> impl Iterator<Item = &Port> {
         self.opte_ports.iter().map(|(port, _)| port)
     }
+
+    /// Returns the filesystem path to the zone's root in the GZ.
+    pub fn root(&self) -> Utf8PathBuf {
+        self.zonepath.join(Self::ROOT_FS_PATH)
+    }
 }
 
 #[derive(Clone)]