Merge branch 'main' of github.com:demeter-run/ext-cardano-ogmios

Author: gonzalezzfelipe

bootstrap/main.tf

@@ -35,9 +35,10 @@ module "ogmios_v1_proxies_blue" {
   cloud_provider    = var.cloud_provider
   cluster_issuer    = var.cluster_issuer
   dns_zone          = var.dns_zone
+  dns_names         = lookup(var.dns_names, each.key, [])
   environment       = var.proxy_blue_environment
   extension_name    = var.extension_name
-  extra_annotations = var.proxy_blue_extra_annotations
+  extra_annotations = lookup(var.proxy_blue_extra_annotations_by_network, each.value, {})
   namespace         = var.namespace
   proxy_image_tag   = var.proxy_blue_image_tag
   replicas          = var.proxy_blue_replicas
@@ -53,9 +54,10 @@ module "ogmios_v1_proxies_green" {
   cloud_provider    = var.cloud_provider
   cluster_issuer    = var.cluster_issuer
   dns_zone          = var.dns_zone
+  dns_names         = lookup(var.dns_names, each.key, [])
   environment       = var.proxy_green_environment
   extension_name    = var.extension_name
-  extra_annotations = var.proxy_green_extra_annotations
+  extra_annotations = lookup(var.proxy_green_extra_annotations_by_network, each.value, {})
   namespace         = var.namespace
   proxy_image_tag   = var.proxy_green_image_tag
   replicas          = var.proxy_green_replicas

bootstrap/proxy/main.tf

@@ -13,7 +13,7 @@ locals {
   ])
 
   # Add the extra URL to the list of generated URLs
-  dns_names        = var.dns_names != null ? var.dns_names : concat(local.by_version, ["*.${var.extension_name}.${var.dns_zone}"])
+  dns_names        = length(var.dns_names) > 0 ? var.dns_names : concat(local.by_version, ["*.${var.extension_name}.${var.dns_zone}"])
   cert_secret_name = var.environment != null ? "${var.extension_name}-${var.environment}-${var.network}-wildcard-tls" : "${var.extension_name}-${var.network}-wildcard-tls"
 }
 
@@ -85,7 +85,7 @@ variable "versions" {
 
 variable "dns_names" {
   type    = list(string)
-  default = null
+  default = []
 }
 
 variable "dns_zone" {

bootstrap/variables.tf

@@ -7,6 +7,12 @@ variable "dns_zone" {
   default = "demeter.run"
 }
 
+variable "dns_names" {
+  description = "Map of network to list of DNS names"
+  type        = map(list(string))
+  default     = {}
+}
+
 variable "cluster_issuer" {
   type    = string
   default = "letsencrypt-dns01"
@@ -100,9 +106,14 @@ variable "proxy_green_replicas" {
   default = 1
 }
 
-variable "proxy_green_extra_annotations" {
-  type    = map(string)
-  default = {}
+variable "proxy_green_extra_annotations_by_network" {
+  description = <<EOT
+A map where keys are network names (only those defined in the "networks" variable)
+and values are maps of extra annotations for the blue proxy service specific
+to that network.
+EOT
+  type        = map(map(string))
+  default     = {}
 }
 
 variable "proxy_green_environment" {
@@ -119,9 +130,14 @@ variable "proxy_blue_replicas" {
   default = 1
 }
 
-variable "proxy_blue_extra_annotations" {
-  type    = map(string)
-  default = {}
+variable "proxy_blue_extra_annotations_by_network" {
+  description = <<EOT
+A map where keys are network names (only those defined in the "networks" variable)
+and values are maps of extra annotations for the blue proxy service specific
+to that network.
+EOT
+  type        = map(map(string))
+  default     = {}
 }
 
 variable "proxy_blue_environment" {