feat: add support for customization

Signed-off-by: Ales Verbic <[email protected]>

Author: verbotenj

bootstrap/cell/main.tf

@@ -34,11 +34,13 @@ locals {
   ]
 }
 module "dbsync_pvc" {
-  source       = "../pvc"
-  namespace    = var.namespace
-  volume_name  = var.volume_name
-  storage_size = var.storage_size
-  name         = local.db_volume_claim
+  source             = "../pvc"
+  namespace          = var.namespace
+  access_mode        = var.access_mode
+  volume_name        = var.volume_name
+  storage_class_name = var.storage_class_name
+  storage_size       = var.storage_size
+  name               = local.db_volume_claim
 }
 
 module "dbsync_postgres" {
@@ -53,6 +55,7 @@ module "dbsync_postgres" {
   postgres_secret_name  = var.postgres_secret_name
   postgres_resources    = var.postgres_resources
   is_blockfrost_backend = var.is_blockfrost_backend
+  postgres_tolerations  = var.postgres_tolerations
 }
 
 module "dbsync_pgbouncer" {
@@ -67,6 +70,7 @@ module "dbsync_pgbouncer" {
   instance_name                 = "postgres-dbsync-v3-${var.salt}"
   postgres_instance_name        = local.postgres_host
   pgbouncer_reloader_image_tag  = var.pgbouncer_reloader_image_tag
+  pgbouncer_tolerations         = var.pgbouncer_tolerations
 }
 
 module "dbsync_instances" {
@@ -82,9 +86,7 @@ module "dbsync_instances" {
   release                = each.value.release
   topology_zone          = coalesce(each.value.topology_zone, var.topology_zone)
   sync_status            = each.value.sync_status
-  empty_args             = coalesce(each.value.empty_args, false)
   custom_config          = coalesce(each.value.custom_config, true)
-  network_env_var        = coalesce(each.value.network_env_var, false)
   enable_postgrest       = each.value.enable_postgrest
   postgres_database      = "dbsync-${each.value.network}"
   postgres_instance_name = local.postgres_host

bootstrap/cell/variables.tf

@@ -7,11 +7,6 @@ variable "salt" {
   description = "Salt used to identify all components as part of the cell. Should be unique between cells."
 }
 
-variable "certs_secret_name" {
-  type    = string
-  default = "pgbouncer-certs"
-}
-
 // PVC
 variable "volume_name" {
   type = string
@@ -21,6 +16,14 @@ variable "storage_size" {
   type = string
 }
 
+variable "storage_class_name" {
+  type = string
+}
+
+variable "access_mode" {
+  type = string
+}
+
 variable "db_volume_claim" {
   type    = string
   default = null
@@ -66,11 +69,54 @@ variable "postgres_config_name" {
   default = null
 }
 
+variable "postgres_tolerations" {
+  type = list(object({
+    key      = string
+    operator = string
+    value    = string
+    effect   = string
+  }))
+  default = [
+    {
+      key      = "demeter.run/compute-profile"
+      operator = "Equal"
+      value    = "disk-intensive"
+      effect   = "NoSchedule"
+    },
+    {
+      key      = "demeter.run/compute-arch"
+      operator = "Equal"
+      value    = "x86"
+      effect   = "NoSchedule"
+    },
+    {
+      key      = "demeter.run/availability-sla"
+      operator = "Equal"
+      value    = "consistent"
+      effect   = "NoSchedule"
+    }
+  ]
+}
+
 // PGBouncer
+
+variable "certs_secret_name" {
+  type    = string
+  default = "pgbouncer-certs"
+}
+
+variable "pgbouncer_cloud_provider" {
+  type = string
+}
+
 variable "pgbouncer_image_tag" {
   default = "1.21.0"
 }
 
+variable "pgbouncer_load_balancer" {
+  type = bool
+}
+
 variable "pgbouncer_replicas" {
   default = 1
 }
@@ -83,6 +129,34 @@ variable "pgbouncer_reloader_image_tag" {
   type = string
 }
 
+variable "pgbouncer_tolerations" {
+  type = list(object({
+    effect   = string
+    key      = string
+    operator = string
+    value    = optional(string)
+  }))
+  default = [
+    {
+      effect   = "NoSchedule"
+      key      = "demeter.run/compute-profile"
+      operator = "Exists"
+    },
+    {
+      effect   = "NoSchedule"
+      key      = "demeter.run/compute-arch"
+      operator = "Equal"
+      value    = "x86"
+    },
+    {
+      effect   = "NoSchedule"
+      key      = "demeter.run/availability-sla"
+      operator = "Equal"
+      value    = "best-effort"
+    }
+  ]
+}
+
 // Instance
 variable "instances" {
   type = map(object({
@@ -94,10 +168,9 @@ variable "instances" {
     release               = string
     sync_status           = string
     enable_postgrest      = bool
-    topology_zone         = optional(string)
-    empty_args            = optional(bool, false)
+    args                  = optional(list(string), [])
     custom_config         = optional(bool, true)
-    network_env_var       = optional(string, false)
+    topology_zone         = optional(string)
     dbsync_resources = optional(object({
       requests = map(string)
       limits   = map(string)
@@ -114,4 +187,3 @@ variable "instances" {
     })))
   }))
 }
-

bootstrap/configs/preview/config.json

@@ -1,12 +1,12 @@
 {
-  "AlonzoGenesisFile": "/genesis/preview/alonzo-genesis.json",
+  "AlonzoGenesisFile": "/opt/cardano/config/preview/alonzo-genesis.json",
   "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
   "ApplicationName": "cardano-sl",
   "ApplicationVersion": 0,
-  "ByronGenesisFile": "/genesis/preview/byron-genesis.json",
+  "ByronGenesisFile": "/opt/cardano/config/preview/byron-genesis.json",
   "ByronGenesisHash": "83de1d7302569ad56cf9139a41e2e11346d4cb4a31c00142557b6ab3fa550761",
-  "ConwayGenesisFile": "/genesis/preview/conway-genesis.json",
-  "ConwayGenesisHash": "f28f1c1280ea0d32f8cd3143e268650d6c1a8e221522ce4a7d20d62fc09783e1",
+  "ConwayGenesisFile": "/opt/cardano/config/preview/conway-genesis.json",
+  "ConwayGenesisHash": "9cc5084f02e27210eacba47af0872e3dba8946ad9460b6072d793e1d2f3987ef",
   "EnableP2P": true,
   "ExperimentalHardForksEnabled": false,
   "ExperimentalProtocolsEnabled": false,
@@ -15,7 +15,7 @@
   "LastKnownBlockVersion-Minor": 1,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresMagic",
-  "ShelleyGenesisFile": "/genesis/preview/shelley-genesis.json",
+  "ShelleyGenesisFile": "/opt/cardano/config/preview/shelley-genesis.json",
   "ShelleyGenesisHash": "363498d1024f84bb39d3fa9593ce391483cb40d479b87233f868d6e57c3a400d",
   "TargetNumberOfActivePeers": 20,
   "TargetNumberOfEstablishedPeers": 50,
@@ -110,4 +110,4 @@
       "scRotation": null
     }
   ]
-}
+}

bootstrap/instance/dbsync.tf

@@ -152,10 +152,7 @@ resource "kubernetes_deployment_v1" "db_sync" {
             requests = var.dbsync_resources.requests
           }
 
-          args = var.empty_args ? [] : [
-            "--config /etc/dbsync/db-sync-config.json",
-            "--socket-path /node-ipc/node.socket",
-          ]
+          args = var.args
 
           env {
             name  = "POSTGRES_USER"
@@ -194,7 +191,7 @@ resource "kubernetes_deployment_v1" "db_sync" {
 
           env {
             name  = "NETWORK"
-            value = var.network_env_var ? var.network : ""
+            value = var.network
           }
 
           dynamic "env" {

bootstrap/instance/main.tf

@@ -8,7 +8,6 @@ terraform {
 
 variable "namespace" {}
 
-
 variable "dbsync_image" {
   type    = string
   default = "ghcr.io/demeter-run/dbsync"
@@ -17,7 +16,9 @@ variable "dbsync_image_tag" {
   default = "132ffd0007054bfadd17b23ed608529447833b99"
 }
 
-variable "network" {}
+variable "network" {
+  type = string
+}
 
 variable "salt" {
   type = string
@@ -101,18 +102,15 @@ variable "availability_sla" {
   default = "consistent"
 }
 
-variable "empty_args" {
-  default = false
+variable "args" {
+  type    = list(string)
+  default = []
 }
 
 variable "custom_config" {
   default = true
 }
 
-variable "network_env_var" {
-  default = false
-}
-
 variable "tolerations" {
   type = list(object({
     effect   = string

bootstrap/main.tf

@@ -23,10 +23,10 @@ module "dbsync_feature" {
 
 // Service
 module "dbsync_service" {
-  depends_on = [kubernetes_namespace.namespace]
-  source     = "./service"
-
-  namespace = var.namespace
+  depends_on     = [kubernetes_namespace.namespace]
+  source         = "./service"
+  cloud_provider = var.cloud_provider
+  namespace      = var.namespace
 }
 
 // Cells
@@ -39,9 +39,11 @@ module "dbsync_cells" {
   salt      = each.key
 
   // PVC
-  volume_name     = each.value.pvc.volume_name
-  storage_size    = each.value.pvc.storage_size
-  db_volume_claim = each.value.pvc.name
+  access_mode        = each.value.pvc.access_mode
+  db_volume_claim    = each.value.pvc.name
+  storage_class_name = each.value.pvc.storage_class_name
+  storage_size       = each.value.pvc.storage_size
+  volume_name        = each.value.pvc.volume_name
 
   // PG
   topology_zone         = each.value.postgres.topology_zone
@@ -50,12 +52,17 @@ module "dbsync_cells" {
   postgres_secret_name  = var.postgres_secret_name
   postgres_resources    = each.value.postgres.resources
   postgres_config_name  = each.value.postgres.config_name
+  postgres_tolerations  = each.value.postgres.tolerations
 
   // PGBouncer
+  certs_secret_name            = each.value.pgbouncer.certs_secret_name
+  pgbouncer_cloud_provider     = var.cloud_provider
   pgbouncer_image_tag          = var.pgbouncer_image_tag
+  pgbouncer_load_balancer      = each.value.pgbouncer.load_balancer
   pgbouncer_replicas           = each.value.pgbouncer.replicas
   pgbouncer_auth_user_password = var.pgbouncer_auth_user_password
   pgbouncer_reloader_image_tag = var.pgbouncer_reloader_image_tag
+  pgbouncer_tolerations        = each.value.pgbouncer.tolerations
 
   // Instances
   instances = each.value.instances

bootstrap/pgbouncer/cert.tf

@@ -0,0 +1,23 @@
+locals {
+  dns_names = flatten(["*.${var.dns_zone}"])
+}
+
+resource "kubernetes_manifest" "certificate_cluster_wildcard_tls" {
+  manifest = {
+    "apiVersion" = "cert-manager.io/v1"
+    "kind"       = "Certificate"
+    "metadata" = {
+      "name"      = var.certs_secret_name
+      "namespace" = var.namespace
+    }
+    "spec" = {
+      "dnsNames" = local.dns_names
+
+      "issuerRef" = {
+        "kind" = "ClusterIssuer"
+        "name" = var.cluster_issuer
+      }
+      "secretName" = var.certs_secret_name
+    }
+  }
+}