Merge pull request #40 from input-output-hk/next-2025-01-21

Ephemeral module, kes rotations, icc secrets

Author: johnalotoski

Justfile

@@ -981,8 +981,8 @@ start-demo:
     BYRON_SIGNING_KEY="$KEY_DIR"/utxo-keys/shelley.000.skey \
       ERA_CMD="alonzo" \
       nix run .#job-move-genesis-utxo
-    echo "Sleeping 7 seconds until $(date -d  @$(($(date +%s) + 7)))"
-    sleep 7
+    echo "Sleeping 10 seconds until $(date -d  @$(($(date +%s) + 10)))"
+    sleep 10
     echo
   fi
 
@@ -991,15 +991,15 @@ start-demo:
     POOL_RELAY_PORT=3001 \
     ERA_CMD="alonzo" \
     nix run .#job-register-stake-pools
-  echo "Sleeping 7 seconds until $(date -d  @$(($(date +%s) + 7)))"
-  sleep 7
+  echo "Sleeping 10 seconds until $(date -d  @$(($(date +%s) + 10)))"
+  sleep 10
   echo
 
   echo "Delegating rewards stake key..."
   ERA_CMD="alonzo" \
     nix run .#job-delegate-rewards-stake-key
-  echo "Sleeping 160 seconds until $(date -d  @$(($(date +%s) + 160)))"
-  sleep 160
+  echo "Sleeping 100 seconds until $(date -d  @$(($(date +%s) + 100)))"
+  sleep 100
   echo
 
   echo "Forking to babbage..."

README.md

@@ -50,27 +50,36 @@ If needed, a new secret can be generated with `age-keygen`.
 
 ## SSH
 
-If your credentials are correct, and the cluster is already bootstrapped with
+If your credentials are correct, and the cluster is already provisioned with
 openTofu infrastructure, you will be able to access SSH after creating an
 `./.ssh_config` using:
 
     just save-ssh-config
 
 With that you can then get started with:
 
-    # Listing machines
+    # List machines
     just list-machines
 
-    # Ssh to machines
+    # Ssh to a newly provisioned machine
+    just ssh-bootstrap $MACHINE
+
+    # Deploy to a newly provisioned machine
+    just apply-bootstrap $MACHINE
+
+    # Ssh to a machine already deployed
     just ssh $MACHINE
 
-    # Finding other operations recipes to use
+    # Deploy to a machine already deployed
+    just apply $MACHINE
+
+    # Find many other operations recipes to use
     just --list
 
 ## Cloudformation
 
 We bootstrap our infrastructure using AWS Cloudformation, it creates resources
-like S3 Buckets, a DNS zone, KMS key, and OpenTofu state storage.
+like S3 Buckets, a DNS Zone, KMS key, and OpenTofu state storage.
 
 The distinction of what is managed by Cloudformation and OpenTofu is not very
 strict, but generally anything that is not of the mentioned resource types will
@@ -114,7 +123,11 @@ To deploy changes on an OS level, we use the excellent
 
 All colmena configuration is in `./flake/colmena.nix`.
 
-To deploy a machine:
+To deploy a machine for the first time:
+
+    just apply-bootstrap $MACHINE
+
+To subsequently deploy a machine:
 
     just apply $MACHINE
 
@@ -132,4 +145,4 @@ Or simply decrypt a KMS or sops age secret with:
 
     sops -d ./secrets/github-token.enc
 
-See also the `just sops-<encrypt|decrypt>-binary` recipes for encrypting or decrypting age binary blobs.
+See also the `just sops-<encrypt|decrypt>-binary` and similar recipes for encrypting or decrypting age binary blobs.

docs/explain/old-node-configs.md

@@ -48,6 +48,11 @@
 
 ## Version Reference:
 
+* Node `10.1.4`
+  * Environment configs can be found in `result/environments/config/` after running:
+    ```bash
+    nix run github:input-output-hk/cardano-playground/node-10.1.4-config#job-gen-env-config
+
 * Node `10.1.3`
   * Environment configs can be found in `result/environments/config/` after running:
     ```bash

flake.lock

@@ -5,8 +5,8 @@
     nixpkgs.follows = "cardano-parts/nixpkgs";
     nixpkgs-unstable.follows = "cardano-parts/nixpkgs-unstable";
     flake-parts.follows = "cardano-parts/flake-parts";
-    cardano-parts.url = "github:input-output-hk/cardano-parts/v2025-01-17";
-    # cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/v2025-01-17";
+    cardano-parts.url = "github:input-output-hk/cardano-parts/v2025-02-04";
+    # cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/v2025-02-04";
 
     # Local pins for additional customization:
     cardano-node-hd.url = "github:IntersectMBO/cardano-node/utxo-hd-9.0";
@@ -22,11 +22,6 @@
     cardano-node-pparams-api.url = "github:johnalotoski/cardano-node-pparams-api";
 
     cardano-new-tracing.url = "github:IntersectMBO/cardano-node/jutaro/new_tracing10_1_2";
-
-    cardano-node-peerSnapshotFile = {
-      url = "github:IntersectMBO/cardano-node/jl/nixos-svc-peerSnapshotFile";
-      flake = false;
-    };
   };
 
   outputs = inputs: let