Merge pull request #1850 from input-output-hk/jpraynaud/1849-upgrade-…

…vm-disk-infra Upgrade infrastructure deployment with disk configurations
input-output-hk · Jul 26, 2024 · 1929911 · 1929911
2 parents cd624da + b7c0427
commit 1929911
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 3 deletions.
diff --git a/.github/workflows/actions/deploy-terraform-infrastructure/action.yml b/.github/workflows/actions/deploy-terraform-infrastructure/action.yml
@@ -36,9 +36,23 @@ inputs:
   google_compute_instance_boot_disk_size:
     description: Google Cloud attached boot disk size in GB.
     required: true
+  google_compute_instance_boot_disk_type:
+    description: Google Cloud type of attached boot disk.
+    required: false
+    default: "pd-standard"
+  google_compute_instance_boot_disk_snapshot:
+    description: Google Cloud snapshot used to restore the boot disk.
+    required: false
   google_compute_instance_data_disk_size:
     description: Google Cloud attached data disk size in GB.
     required: true
+  google_compute_instance_data_disk_type:
+    description: Google Cloud type of attached data disk.
+    required: false
+    default: "pd-standard"
+  google_compute_instance_data_disk_snapshot:
+    description: Google Cloud snapshot used to restore the data disk.
+    required: false
   google_application_credentials:
     description: Google Cloud application credentials (service account).
     required: true
@@ -174,7 +188,11 @@ runs:
           google_zone                                                               = "${{ inputs.google_zone }}"
           google_machine_type                                                       = "${{ inputs.google_machine_type }}"
           google_compute_instance_boot_disk_size                                    = "${{ inputs.google_compute_instance_boot_disk_size }}"
+          google_compute_instance_boot_disk_type                                    = "${{ inputs.google_compute_instance_boot_disk_type }}"
+          google_compute_instance_boot_disk_snapshot                                = "${{ inputs.google_compute_instance_boot_disk_snapshot }}"
           google_compute_instance_data_disk_size                                    = "${{ inputs.google_compute_instance_data_disk_size }}"
+          google_compute_instance_data_disk_type                                    = "${{ inputs.google_compute_instance_data_disk_type }}"
+          google_compute_instance_data_disk_snapshot                                = "${{ inputs.google_compute_instance_data_disk_snapshot }}"
           google_service_credentials_json_file                                      = "./google-application-credentials.json"
           mithril_use_p2p_network                                                   = "${{ inputs.mithril_use_p2p_network }}"
           mithril_api_domain                                                        = "${{ inputs.mithril_api_domain }}"

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -181,7 +181,9 @@ jobs:
             google_zone: europe-west1-b
             google_machine_type: e2-highmem-2
             google_compute_instance_boot_disk_size: 200
+            google_compute_instance_boot_disk_type: pd-standard
             google_compute_instance_data_disk_size: 250
+            google_compute_instance_data_disk_type: pd-standard
     environment: ${{ matrix.environment }}
     runs-on: ubuntu-22.04
     needs:
@@ -210,7 +212,10 @@ jobs:
           google_zone: ${{ matrix.google_zone }}
           google_machine_type: ${{ matrix.google_machine_type }}
           google_compute_instance_boot_disk_size: ${{ matrix.google_compute_instance_boot_disk_size }}
+          google_compute_instance_boot_disk_type: ${{ matrix.google_compute_instance_boot_disk_type }}
           google_compute_instance_data_disk_size: ${{ matrix.google_compute_instance_data_disk_size }}
+          google_compute_instance_data_disk_type: ${{ matrix.google_compute_instance_data_disk_type }}
+          google_compute_instance_data_disk_snapshot: ${{ vars.GOOGLE_COMPUTE_INSTANCE_DATA_DISK_SNAPSHOT }}
           google_application_credentials: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
           mithril_api_domain: ${{ matrix.mithril_api_domain }}
           mithril_image_id: ${{ env.DOCKER_IMAGE_ID }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -92,7 +92,9 @@ jobs:
             google_zone: europe-west1-b
             google_machine_type: e2-highmem-2
             google_compute_instance_boot_disk_size: 200
+            google_compute_instance_boot_disk_type: pd-standard
             google_compute_instance_data_disk_size: 250
+            google_compute_instance_data_disk_type: pd-standard
           - environment: release-mainnet
             environment_prefix: release
             cardano_network: mainnet
@@ -110,7 +112,9 @@ jobs:
             google_zone: europe-west1-b
             google_machine_type: e2-highmem-8
             google_compute_instance_boot_disk_size: 250
+            google_compute_instance_boot_disk_type: pd-standard
             google_compute_instance_data_disk_size: 1000
+            google_compute_instance_data_disk_type: pd-standard
 
     environment: ${{ matrix.environment }}
     runs-on: ubuntu-22.04
@@ -140,7 +144,10 @@ jobs:
           google_zone: ${{ matrix.google_zone }}
           google_machine_type: ${{ matrix.google_machine_type }}
           google_compute_instance_boot_disk_size: ${{ matrix.google_compute_instance_boot_disk_size }}
+          google_compute_instance_boot_disk_type: ${{ matrix.google_compute_instance_boot_disk_type }}
           google_compute_instance_data_disk_size: ${{ matrix.google_compute_instance_data_disk_size }}
+          google_compute_instance_data_disk_type: ${{ matrix.google_compute_instance_data_disk_type }}
+          google_compute_instance_data_disk_snapshot: ${{ vars.GOOGLE_COMPUTE_INSTANCE_DATA_DISK_SNAPSHOT }}
           google_application_credentials: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
           mithril_api_domain: ${{ matrix.mithril_api_domain }}
           mithril_image_id: ${{ env.DOCKER_IMAGE_ID }}

diff --git a/.github/workflows/test-deploy-network.yml b/.github/workflows/test-deploy-network.yml
@@ -15,6 +15,7 @@ on:
         type: choice
         options:
           - dev-preview
+          - dev-mainnet
           - testing-mainnet
       dry_run:
         description: Dry run will not deploy the distribution to the Mithril network
@@ -27,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        environment: [dev-preview, testing-mainnet]
+        environment: [dev-preview, dev-mainnet, testing-mainnet]
         include:
           - environment: dev-preview
             environment_prefix: dev
@@ -61,7 +62,36 @@ jobs:
             google_zone: europe-west1-b
             google_machine_type: e2-highmem-4
             google_compute_instance_boot_disk_size: 200
+            google_compute_instance_boot_disk_type: pd-standard
             google_compute_instance_data_disk_size: 250
+            google_compute_instance_data_disk_type: pd-standard
+          - environment: dev-mainnet
+            environment_prefix: dev
+            cardano_network: mainnet
+            mithril_use_p2p_network: false
+            mithril_api_domain: api.mithril.network
+            mithril_era_reader_adapter_type: bootstrap
+            mithril_protocol_parameters: |
+              {
+                k     = 2422
+                m     = 20973
+                phi_f = 0.20
+              }
+            mithril_signers: |
+              {
+                "1" = {
+                  type    = "unverified-alone",
+                  pool_id = "pool1re8cmjt895tpx8dx2veg0cew5yqtxnt82sll03e433a4ugnh9w7",
+                }
+              }
+            terraform_backend_bucket: hydra-terraform-admin
+            google_region: europe-west1
+            google_zone: europe-west1-b
+            google_machine_type: e2-highmem-8
+            google_compute_instance_boot_disk_size: 250
+            google_compute_instance_boot_disk_type: pd-standard
+            google_compute_instance_data_disk_size: 1000
+            google_compute_instance_data_disk_type: pd-balanced
           - environment: testing-mainnet
             environment_prefix: testing
             cardano_network: mainnet
@@ -86,7 +116,9 @@ jobs:
             google_zone: europe-west1-b
             google_machine_type: e2-highmem-8
             google_compute_instance_boot_disk_size: 250
+            google_compute_instance_boot_disk_type: pd-standard
             google_compute_instance_data_disk_size: 1000
+            google_compute_instance_data_disk_type: pd-balanced
 
     environment: ${{ matrix.environment }}
     runs-on: ubuntu-22.04
@@ -113,7 +145,10 @@ jobs:
           google_zone: ${{ matrix.google_zone }}
           google_machine_type: ${{ matrix.google_machine_type }}
           google_compute_instance_boot_disk_size: ${{ matrix.google_compute_instance_boot_disk_size }}
+          google_compute_instance_boot_disk_type: ${{ matrix.google_compute_instance_boot_disk_type }}
           google_compute_instance_data_disk_size: ${{ matrix.google_compute_instance_data_disk_size }}
+          google_compute_instance_data_disk_type: ${{ matrix.google_compute_instance_data_disk_type }}
+          google_compute_instance_data_disk_snapshot: ${{ vars.GOOGLE_COMPUTE_INSTANCE_DATA_DISK_SNAPSHOT }}
           google_application_credentials: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
           mithril_use_p2p_network: ${{ matrix.mithril_use_p2p_network }}
           mithril_api_domain: ${{ matrix.mithril_api_domain }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ As a minor extension, we have adopted a slightly different versioning convention
 
 - Support for `Cardano node` `9.1.0` in the signer and the aggregator.
 
+- Support better disk configuration in terraform deployments with the CI/CD workflows.
+
 - **UNSTABLE** Cardano transactions certification:
 
   - Make Cardano transaction signing settings configurable via the CD.

diff --git a/mithril-infra/assets/infra.version b/mithril-infra/assets/infra.version
@@ -1 +1 @@
-0.2.26
+0.2.27
diff --git a/mithril-infra/main.data-disk.tf b/mithril-infra/main.data-disk.tf
@@ -70,7 +70,7 @@ resource "null_resource" "mithril_mount_data_disk" {
       <<-EOT
 set -e
 # Format data disk if necessary
-if sudo blkid /dev/sdb; then 
+if sudo blkid /dev/disk/by-id/google-mithril-data-disk; then 
   echo "Data disk already formatted"
 else 
   # Format data disk