Add fixes on service and queue

demeter-run · Jul 12, 2024 · 49945ef · 49945ef
1 parent 0bd020c
commit 49945ef
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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"
     }
   }
 }