chore: fine tune bootstrap

demeter-run · Mar 4, 2024 · 8309d36 · 8309d36
1 parent 75564b7
commit 8309d36
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/bootstrap/crds/main.tf b/bootstrap/crds/main.tf
@@ -8,10 +8,14 @@ resource "kubernetes_manifest" "customresourcedefinition_ogmiosports_demeter_run
     "spec" = {
       "group" = "demeter.run"
       "names" = {
-        "categories" = []
+        "categories" = [
+          "demeter-port",
+        ]
         "kind" = "OgmiosPort"
         "plural" = "ogmiosports"
-        "shortNames" = []
+        "shortNames" = [
+          "opt",
+        ]
         "singular" = "ogmiosport"
       }
       "scope" = "Namespaced"
@@ -43,6 +47,11 @@ resource "kubernetes_manifest" "customresourcedefinition_ogmiosports_demeter_run
               "name" = "Auth Token"
               "type" = "string"
             },
+            {
+              "jsonPath" = ".spec.throughputTier"
+              "name" = "Throughput Tier"
+              "type" = "string"
+            },
           ]
           "name" = "v1alpha1"
           "schema" = {
@@ -60,6 +69,9 @@ resource "kubernetes_manifest" "customresourcedefinition_ogmiosports_demeter_run
                       ]
                       "type" = "string"
                     }
+                    "throughputTier" = {
+                      "type" = "string"
+                    }
                     "version" = {
                       "format" = "uint8"
                       "minimum" = 0
@@ -68,6 +80,7 @@ resource "kubernetes_manifest" "customresourcedefinition_ogmiosports_demeter_run
                   }
                   "required" = [
                     "network",
+                    "throughputTier",
                     "version",
                   ]
                   "type" = "object"

diff --git a/bootstrap/main.tf b/bootstrap/main.tf
@@ -18,15 +18,16 @@ module "ogmios_v1_feature" {
   source             = "./feature"
   namespace          = var.namespace
   operator_image_tag = var.operator_image_tag
-  metrics_delay      = 60
+  metrics_delay      = var.metrics_delay
   extension_name     = var.extension_name
+  api_key_salt       = var.api_key_salt
 }
 
 module "ogmios_v1_proxy" {
   depends_on      = [kubernetes_namespace.namespace]
   source          = "./proxy"
   namespace       = var.namespace
-  replicas        = 1
+  replicas        = var.proxy_replicas
   proxy_image_tag = var.proxy_image_tag
   extension_name  = var.extension_name
 }
@@ -54,6 +55,7 @@ module "ogmios_instances" {
   node_private_dns = each.value.node_private_dns
   ogmios_version   = each.value.ogmios_version
   compute_arch     = each.value.compute_arch
+  replicas         = each.value.replicas
 }
 
 module "ogmios_services" {

diff --git a/bootstrap/proxy/monitor.tf b/bootstrap/proxy/monitor.tf
@@ -19,7 +19,7 @@ resource "kubernetes_manifest" "operator_monitor" {
       podMetricsEndpoints = [
         {
           port = "metrics",
-          path = "/"
+          path = "/metrics"
         }
       ]
     }

diff --git a/bootstrap/variables.tf b/bootstrap/variables.tf
@@ -118,5 +118,6 @@ variable "instances" {
     node_private_dns = string
     ogmios_version   = string
     compute_arch     = string
+    replicas         = number
   }))
 }