From 0bd020c37d9d8bad9999b1781c9f382ff1c91152 Mon Sep 17 00:00:00 2001
From: gonzalezzfelipe <gonzalezz_felipe@hotmail.com>
Date: Fri, 12 Jul 2024 15:21:02 -0300
Subject: [PATCH 1/2] fix: Add consumer name to daemon bootstrap

---
 bootstrap/daemon/config.tf         | 3 ++-
 bootstrap/daemon/daemon.toml.tftpl | 1 +
 bootstrap/daemon/main.tf           | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bootstrap/daemon/config.tf b/bootstrap/daemon/config.tf
index 6295f03..d82cd16 100644
--- a/bootstrap/daemon/config.tf
+++ b/bootstrap/daemon/config.tf
@@ -8,7 +8,8 @@ resource "kubernetes_config_map_v1" "fabric_daemon_config" {
     "daemon.toml" = "${templatefile(
       "${path.module}/daemon.toml.tftpl",
       {
-        broker_urls = var.broker_urls
+        broker_urls   = var.broker_urls
+        consumer_name = var.consumer_name
       }
     )}"
   }
diff --git a/bootstrap/daemon/daemon.toml.tftpl b/bootstrap/daemon/daemon.toml.tftpl
index 6f2e780..b9b80df 100644
--- a/bootstrap/daemon/daemon.toml.tftpl
+++ b/bootstrap/daemon/daemon.toml.tftpl
@@ -1 +1,2 @@
 brokers="${broker_urls}"
+consumer_name="${consumer_name}"
diff --git a/bootstrap/daemon/main.tf b/bootstrap/daemon/main.tf
index 792b724..8f399ba 100644
--- a/bootstrap/daemon/main.tf
+++ b/bootstrap/daemon/main.tf
@@ -16,6 +16,10 @@ variable "broker_urls" {
   description = "Comma separated values of the queue broker urls."
 }
 
+variable "consumer_name" {
+  type = string
+}
+
 variable "replicas" {
   type    = number
   default = 1

From 49945ef4a340dc36d20201189f666d59a19c6588 Mon Sep 17 00:00:00 2001
From: gonzalezzfelipe <gonzalezz_felipe@hotmail.com>
Date: Fri, 12 Jul 2024 15:28:17 -0300
Subject: [PATCH 2/2] Add fixes on service and queue

---
 bootstrap/queue/main.tf    |  9 +++++++++
 bootstrap/queue/sts.tf     | 24 +-----------------------
 bootstrap/services/main.tf |  4 +++-
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/bootstrap/queue/main.tf b/bootstrap/queue/main.tf
index 5bf898d..b78c772 100644
--- a/bootstrap/queue/main.tf
+++ b/bootstrap/queue/main.tf
@@ -17,6 +17,15 @@ variable "instance_name" {
   type = string
 }
 
+variable "external_dns" {
+  type = string
+}
+
+variable "external_port" {
+  type    = string
+  default = 9092
+}
+
 variable "topology_zone" {
   type    = string
   default = null
diff --git a/bootstrap/queue/sts.tf b/bootstrap/queue/sts.tf
index c336749..2a38859 100644
--- a/bootstrap/queue/sts.tf
+++ b/bootstrap/queue/sts.tf
@@ -5,7 +5,7 @@ locals {
     "--kafka-addr",
     "internal://${var.instance_name}-0:${local.kafka_internal_port},external://0.0.0.0:${local.kafka_external_port}",
     "--advertise-kafka-addr",
-    "internal://${var.instance_name}:${local.kafka_internal_port},external://${var.instance_name}:${local.kafka_external_port}",
+    "internal://${var.instance_name}:${local.kafka_internal_port},external://${var.external_dns}:${var.external_port}",
     "--pandaproxy-addr",
     "internal://${var.instance_name}-0:${local.pandaproxy_internal_port},external://0.0.0.0:${local.pandaproxy_external_port}",
     "--advertise-pandaproxy-addr",
@@ -83,28 +83,6 @@ resource "kubernetes_stateful_set_v1" "queue_main" {
               memory = var.resources.requests.memory
             }
           }
-
-          # lifecycle {
-          #   post_start {
-          #     exec {
-          #       # command = [
-          #       #   "rpk",
-          #       #   "-X",
-          #       #   "brokers=${var.instance_name}:${local.kafka_external_port}",
-          #       #   "topic",
-          #       #   "create",
-          #       #   "events"
-          #       # ]
-          #
-          #       command = [
-          #         "sh", "-c", <<-EOT
-          #         sleep 1
-          #         rpk -X brokers=fabric-queue-0:9092 topic create events
-          #         EOT
-          #       ]
-          #     }
-          #   }
-          # }
         }
 
         dynamic "toleration" {
diff --git a/bootstrap/services/main.tf b/bootstrap/services/main.tf
index e0a17be..f65ca07 100644
--- a/bootstrap/services/main.tf
+++ b/bootstrap/services/main.tf
@@ -46,6 +46,7 @@ resource "kubernetes_ingress_v1" "fabric-rpc-ingress" {
     namespace = var.namespace
     annotations = {
       "cert-manager.io/cluster-issuer" = "letsencrypt"
+      "nginx.ingress.kubernetes.io/backend-protocol" : "GRPC"
     }
   }
 
@@ -70,7 +71,8 @@ resource "kubernetes_ingress_v1" "fabric-rpc-ingress" {
       }
     }
     tls {
-      hosts = ["rpc.${var.dns_zone}"]
+      hosts       = ["rpc.${var.dns_zone}"]
+      secret_name = "rpc-tls"
     }
   }
 }