Ready

Created using spr 1.3.6-beta.1
oxidecomputer · Feb 23, 2024 · 4a18432 · 4a18432
2 parents 6116a33 + 119bcd1
commit 4a18432
Show file tree

Hide file tree

Showing 29 changed files with 1,396 additions and 58 deletions.
diff --git a/.github/buildomat/jobs/tuf-repo.sh b/.github/buildomat/jobs/tuf-repo.sh
@@ -278,8 +278,8 @@ EOF
     done
 }
 # usage:              SERIES           ROT_DIR      ROT_VERSION              BOARDS...
-add_hubris_artifacts  rot-staging-dev  staging/dev  cert-staging-dev-v1.0.5  "${ALL_BOARDS[@]}"
-add_hubris_artifacts  rot-prod-rel     prod/rel     cert-prod-rel-v1.0.5     "${ALL_BOARDS[@]}"
+add_hubris_artifacts  rot-staging-dev  staging/dev  cert-staging-dev-v1.0.6  "${ALL_BOARDS[@]}"
+add_hubris_artifacts  rot-prod-rel     prod/rel     cert-prod-rel-v1.0.6     "${ALL_BOARDS[@]}"
 
 for series in "${SERIES_LIST[@]}"; do
     /work/tufaceous assemble --no-generate-key /work/manifest-"$series".toml /work/repo-"$series".zip

diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@12af778b97addf4c562c75a0564dc7e7dc5339a5 # v2
+        uses: taiki-e/install-action@19e9b549a48620cc50fcf6e6e866b8fb4eca1b01 # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date

diff --git a/nexus/blueprint-execution/src/lib.rs b/nexus/blueprint-execution/src/lib.rs
@@ -21,6 +21,7 @@ use uuid::Uuid;
 
 mod dns;
 mod omicron_zones;
+mod resource_allocation;
 
 struct Sled {
     id: Uuid,
@@ -69,6 +70,14 @@ where
         "blueprint_id" => ?blueprint.id
     );
 
+    resource_allocation::ensure_zone_resources_allocated(
+        &opctx,
+        datastore,
+        &blueprint.omicron_zones,
+    )
+    .await
+    .map_err(|err| vec![err])?;
+
     let sleds_by_id: BTreeMap<Uuid, _> = datastore
         .sled_list_all_batched(&opctx)
         .await
@@ -82,9 +91,9 @@ where
 
     dns::deploy_dns(
         &opctx,
-        &datastore,
+        datastore,
         String::from(nexus_label),
-        &blueprint,
+        blueprint,
         &sleds_by_id,
     )
     .await