feat(bootstrap): add dynamic support for tolerations

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

Author: verbotenj

Diff for: bootstrap/instance/main.tf

@@ -55,7 +55,31 @@ variable "resources" {
   }
 }
 
-
-variable "compute_arch" {
-  type = string
-}
+variable "tolerations" {
+  description = "List of tolerations for the instance"
+  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    = "consistent"
+    }
+  ]
+}

Diff for: bootstrap/instance/ogmios.tf

@@ -62,7 +62,7 @@ resource "kubernetes_deployment_v1" "ogmios" {
           name              = "main"
           image             = local.image
           image_pull_policy = "IfNotPresent"
-          args = local.container_args
+          args              = local.container_args
 
           resources {
             limits = {
@@ -137,24 +137,14 @@ resource "kubernetes_deployment_v1" "ogmios" {
           }
         }
 
-        toleration {
-          effect   = "NoSchedule"
-          key      = "demeter.run/compute-profile"
-          operator = "Exists"
-        }
-
-        toleration {
-          effect   = "NoSchedule"
-          key      = "demeter.run/compute-arch"
-          operator = "Equal"
-          value    = var.compute_arch
-        }
-
-        toleration {
-          effect   = "NoSchedule"
-          key      = "demeter.run/availability-sla"
-          operator = "Equal"
-          value    = "consistent"
+        dynamic "toleration" {
+          for_each = var.tolerations
+          content {
+            effect   = toleration.value.effect
+            key      = toleration.value.key
+            operator = toleration.value.operator
+            value    = toleration.value.value
+          }
         }
       }
     }

Diff for: bootstrap/main.tf

@@ -75,7 +75,7 @@ module "ogmios_instances" {
   ogmios_image     = each.value.ogmios_image
   node_private_dns = each.value.node_private_dns
   ogmios_version   = each.value.ogmios_version
-  compute_arch     = each.value.compute_arch
+  tolerations      = each.value.tolerations
   replicas         = each.value.replicas
 }
 

Diff for: bootstrap/proxy/service.tf

@@ -7,7 +7,7 @@ resource "kubernetes_service_v1" "proxy_service_aws" {
       "service.beta.kubernetes.io/aws-load-balancer-nlb-target-type" : "instance"
       "service.beta.kubernetes.io/aws-load-balancer-scheme" : "internet-facing"
       "service.beta.kubernetes.io/aws-load-balancer-type" : "external"
-      "service.beta.kubernetes.io/aws-load-balancer-healthcheck-protocol" : "HTTP"
+      "service.beta.kubernetes.io/aws-load-balancer-healthcheck-protocol" : "HTTPS"
       "service.beta.kubernetes.io/aws-load-balancer-healthcheck-path" : "/healthz"
       "service.beta.kubernetes.io/aws-load-balancer-healthcheck-port" : var.healthcheck_port != null ? var.healthcheck_port : "traffic-port"
     }
@@ -19,7 +19,7 @@ resource "kubernetes_service_v1" "proxy_service_aws" {
 
     port {
       name        = "proxy"
-      port        = 9443
+      port        = 443
       target_port = local.proxy_port
       protocol    = "TCP"
     }
@@ -52,7 +52,7 @@ resource "kubernetes_service_v1" "proxy_service_gcp" {
 
     port {
       name        = "proxy"
-      port        = 9443
+      port        = 443
       target_port = local.proxy_port
       protocol    = "TCP"
     }

Diff for: bootstrap/variables.tf

@@ -157,5 +157,11 @@ variable "instances" {
         memory = string
       })
     }))
+    tolerations = optional(list(object({
+      effect   = string
+      key      = string
+      operator = string
+      value    = optional(string)
+    })))
   }))
 }