Merge pull request #37 from gonzalezzfelipe/chore/snapshot-from-s3

chore: Snapshot from S3

.github/images/init/dockerfile.init

@@ -1,4 +1,4 @@
 FROM amazon/aws-cli
 RUN yum update -y  && yum install -y tar gzip
-COPY docker/entrypoint.sh /entrypoint.sh
+COPY .github/images/init/entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["sh", "/entrypoint.sh"]

.github/workflows/deploy.yml

@@ -128,6 +128,8 @@ jobs:
       TF_VAR_blockfrost_key: ${{ secrets.DEV_BLOCKFROST_KEY }}
       TF_VAR_dmtr_api_key: ${{ secrets.DEV_DMTR_API_KEY }}
       TF_VAR_admin_key: ${{ secrets.DEV_HYDRA_ADMIN_KEY }}
+      TF_VAR_snapshot_aws_access_key_id: ${{ secrets.SNAPSHOT_AWS_ACCESS_KEY_ID }}
+      TF_VAR_snapshot_aws_secret_access_key: ${{ secrets.SNAPSHOT_AWS_SECRET_ACCESS_KEY }}
 
       # Vars
       TF_VAR_dmtr_port_name: preprod-4raar2

.github/workflows/init.yml

@@ -0,0 +1,41 @@
+name: Init
+
+on:
+  push:
+    branches:
+      - "main"
+    paths:
+      - ".github/workflows/init.yml"
+      - ".github/images/init/**"
+  workflow_dispatch: {}
+
+jobs:
+  build-images:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - context: .
+            file: .github/images/init/dockerfile.init
+            endpoint: cardano-scaling/hydra-control-plane-init
+
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: ${{ matrix.context }}
+          file: ${{ matrix.file }}
+          platforms: linux/amd64
+          push: true
+          tags: ghcr.io/${{ matrix.endpoint }},ghcr.io/${{ matrix.endpoint }}:${{ github.sha }}

bootstrap/stage2/deployment.tf

@@ -111,6 +111,26 @@ resource "kubernetes_deployment_v1" "operator" {
             value = var.dmtr_port_name
           }
 
+          env {
+            name  = "INIT_IMAGE"
+            value = var.init_image
+          }
+
+          env {
+            name  = "BUCKET"
+            value = var.bucket
+          }
+
+          env {
+            name  = "INIT_AWS_ACCESS_KEY_ID"
+            value = var.init_aws_access_key_id
+          }
+
+          env {
+            name  = "INIT_AWS_SECRET_ACCESS_KEY"
+            value = var.init_aws_secret_access_key
+          }
+
           resources {
             limits = {
               cpu    = var.resources.limits.cpu

bootstrap/stage2/main.tf

@@ -101,6 +101,23 @@ variable "dmtr_port_name" {
   type = string
 }
 
+variable "init_image" {
+  type = string
+}
+
+variable "bucket" {
+  type    = string
+  default = "hydradoomsnapshots"
+}
+
+variable "init_aws_access_key_id" {
+  type = string
+}
+
+variable "init_aws_secret_access_key" {
+  type = string
+}
+
 variable "tolerations" {
   type = list(object({
     effect   = string

crates/operator/src/config.rs

@@ -12,7 +12,7 @@ pub fn get_config() -> &'static Config {
 #[derive(Debug, Clone)]
 pub struct Config {
     pub image: String,
-    pub open_head_image: String,
+    pub init_image: String,
     pub sidecar_image: String,
     pub configmap: String,
     pub secret: String,
@@ -25,13 +25,15 @@ pub struct Config {
     pub dmtr_project_id: String,
     pub dmtr_api_key: String,
     pub dmtr_port_name: String,
+    pub bucket: String,
+    pub init_aws_access_key_id: String,
+    pub init_aws_secret_access_key: String,
 }
 
 impl Config {
     pub fn from_env() -> Self {
         Self {
             image: env::var("IMAGE").unwrap_or("ghcr.io/cardano-scaling/hydra-node".into()),
-            open_head_image: env::var("OPEN_HEAD_IMAGE").expect("Missing OPEN_HEAD_IMAGE env var"),
             sidecar_image: env::var("SIDECAR_IMAGE").expect("Missing SIDECAR_IMAGE env var"),
             configmap: env::var("CONFIGMAP").expect("Missing CONFIGMAP env var"),
             secret: env::var("SECRET").expect("Missing SECRET env var"),
@@ -46,6 +48,12 @@ impl Config {
             dmtr_project_id: env::var("DMTR_PROJECT_ID").expect("Missing DMTR_PROJECT_ID env var."),
             dmtr_api_key: env::var("DMTR_API_KEY").expect("Missing DMTR_API_KEY env var."),
             dmtr_port_name: env::var("DMTR_PORT_NAME").expect("Missing DMTR_PORT_NAME env var."),
+            init_image: env::var("INIT_IMAGE").expect("Missing INIT_IMAGE env var."),
+            bucket: env::var("BUCKET").expect("Missing BUCKET env var."),
+            init_aws_access_key_id: env::var("INIT_AWS_ACCESS_KEY_ID")
+                .expect("Missing INIT_AWS_ACCESS_KEY_ID env var."),
+            init_aws_secret_access_key: env::var("INIT_AWS_SECRET_ACCESS_KEY")
+                .expect("Missing INIT_AWS_SECRET_ACCESS_KEY env var."),
         }
     }
 }

crates/operator/src/custom_resource.rs

@@ -3,7 +3,7 @@ use k8s_openapi::{
         apps::v1::{Deployment, DeploymentSpec},
         core::v1::{
             ConfigMap, ConfigMapVolumeSource, Container, ContainerPort, EmptyDirVolumeSource,
-            PodSpec, PodTemplateSpec, ResourceRequirements, SecretVolumeSource, Service,
+            EnvVar, PodSpec, PodTemplateSpec, ResourceRequirements, SecretVolumeSource, Service,
             ServicePort, ServiceSpec, Volume, VolumeMount,
         },
         networking::v1::{
@@ -185,7 +185,7 @@ impl HydraDoomNode {
             "--api-port".to_string(),
             constants.port.to_string(),
             "--hydra-signing-key".to_string(),
-            format!("{}/hydra.sk", constants.data_dir),
+            format!("{}/keys/hydra.sk", constants.data_dir),
             "--ledger-protocol-parameters".to_string(),
             format!("{}/protocol-parameters.json", constants.config_dir),
             "--persistence-dir".to_string(),
@@ -265,8 +265,8 @@ impl HydraDoomNode {
             Container {
                 name: "sidecar".to_string(),
                 image: Some(config.sidecar_image.clone()),
-                command: Some(vec!["metrics-exporter".to_string()]),
                 args: Some(vec![
+                    "metrics-exporter".to_string(),
                     "--host".to_string(),
                     "localhost".to_string(),
                     "--port".to_string(),
@@ -284,52 +284,6 @@ impl HydraDoomNode {
 
         // Offline is optional. If undefined, the node is presumed to be online.
         if !self.spec.offline.unwrap_or(false) {
-            let mut open_head_args = vec![
-                "open-head".to_string(),
-                "--network-id".to_string(),
-                self.spec.network_id.unwrap_or(0).to_string(),
-                "--seed-input".to_string(),
-                self.spec.seed_input.clone(),
-                "--participant".to_string(),
-                config.admin_addr.clone(),
-                "--party-verification-file".to_string(),
-                format!("{}/hydra.vk", constants.data_dir),
-                "--cardano-key-file".to_string(),
-                format!("{}/admin.sk", constants.secret_dir),
-                "--blockfrost-key".to_string(),
-                config.blockfrost_key.clone(),
-            ];
-            if !self.spec.commit_inputs.is_empty() {
-                open_head_args.push("--commit-inputs".to_string());
-                open_head_args.extend(self.spec.commit_inputs.clone());
-            }
-
-            containers.push(Container {
-                name: "open-head".to_string(),
-                image: Some(config.open_head_image.clone()),
-                command: Some(vec!["open-head".to_string()]),
-                args: Some(open_head_args),
-                volume_mounts: Some(vec![
-                    VolumeMount {
-                        name: "config".to_string(),
-                        mount_path: constants.config_dir.clone(),
-                        ..Default::default()
-                    },
-                    VolumeMount {
-                        name: "secret".to_string(),
-                        mount_path: constants.secret_dir.clone(),
-                        ..Default::default()
-                    },
-                    VolumeMount {
-                        name: "data".to_string(),
-                        mount_path: constants.data_dir.clone(),
-                        ..Default::default()
-                    },
-                ]),
-                resources: None,
-                ..Default::default()
-            });
-
             containers.push(Container {
                 name: "dmtrctl".to_string(),
                 image: Some(constants.dmtrctl_image.to_string()),
@@ -376,11 +330,33 @@ impl HydraDoomNode {
                     spec: Some(PodSpec {
                         init_containers: Some(vec![Container {
                             name: "init".to_string(),
-                            image: Some(config.image.clone()),
-                            args: Some(vec![
-                                "gen-hydra-key".to_string(),
-                                "--output-file".to_string(),
-                                format!("{}/hydra", constants.data_dir),
+                            image: Some(config.init_image.clone()),
+                            env: Some(vec![
+                                EnvVar {
+                                    name: "BUCKET".to_string(),
+                                    value: Some(config.bucket.clone()),
+                                    ..Default::default()
+                                },
+                                EnvVar {
+                                    name: "KEY".to_string(),
+                                    value: Some(format!("{}.tar.gz", self.name_any())),
+                                    ..Default::default()
+                                },
+                                EnvVar {
+                                    name: "DATA_DIR".to_string(),
+                                    value: Some(constants.data_dir.clone()),
+                                    ..Default::default()
+                                },
+                                EnvVar {
+                                    name: "AWS_ACCESS_KEY_ID".to_string(),
+                                    value: Some(config.init_aws_access_key_id.clone()),
+                                    ..Default::default()
+                                },
+                                EnvVar {
+                                    name: "AWS_SECRET_ACCESS_KEY".to_string(),
+                                    value: Some(config.init_aws_secret_access_key.clone()),
+                                    ..Default::default()
+                                },
                             ]),
                             volume_mounts: Some(vec![VolumeMount {
                                 name: "data".to_string(),

playbook/doom-dev/main.tf

@@ -71,6 +71,13 @@ variable "admin_key" {
   type = string
 }
 
+variable "snapshot_aws_access_key_id" {
+  type = string
+}
+
+variable "snapshot_aws_secret_access_key" {
+  type = string
+
 variable "frontend_image" {
   type = string
 }
@@ -100,19 +107,22 @@ module "stage2" {
   external_port       = 443
   external_protocol   = "wss"
 
-  namespace           = local.namespace
-  external_domain     = var.external_domain
-  hydra_node_image    = var.hydra_node_image
-  operator_image      = var.image
-  sidecar_image       = var.image
-  open_head_image     = var.image
-  control_plane_image = var.image
-  blockfrost_key      = var.blockfrost_key
-  admin_addr          = var.admin_addr
-  dmtr_project_id     = var.dmtr_project_id
-  dmtr_api_key        = var.dmtr_api_key
-  dmtr_port_name      = var.dmtr_port_name
-  hydra_scripts_tx_id = var.hydra_scripts_tx_id
-  frontend_image      = var.frontend_image
-  frontend_replicas   = var.frontend_replicas
+  namespace                  = local.namespace
+  external_domain            = var.external_domain
+  hydra_node_image           = var.hydra_node_image
+  operator_image             = var.image
+  sidecar_image              = var.image
+  open_head_image            = var.image
+  control_plane_image        = var.image
+  blockfrost_key             = var.blockfrost_key
+  admin_addr                 = var.admin_addr
+  dmtr_project_id            = var.dmtr_project_id
+  dmtr_api_key               = var.dmtr_api_key
+  dmtr_port_name             = var.dmtr_port_name
+  hydra_scripts_tx_id        = var.hydra_scripts_tx_id
+  init_aws_access_key_id     = var.snapshot_aws_access_key_id
+  init_aws_secret_access_key = var.snapshot_aws_secret_access_key
+  init_image                 = "ghcr.io/demeter-run/doom-patrol-init:b7b4fc499b5274cd71b6b72f93ab4ba8199437fe"
+  frontend_image             = var.frontend_image
+  frontend_replicas          = var.frontend_replicas
 }