Ingress (#16)

* remove headless services, add ingress objects

* typo

Author: spaghettifunk

main.tf

@@ -40,18 +40,27 @@ module "zookeeper" {
 module "druid" {
   source = "./modules/druid"
 
-  namespace                 = kubernetes_namespace.druid.metadata.0.name
-  druid_image               = local.druid_image
-  broker_replicas           = var.broker_replicas
-  coordinator_replicas      = var.coordinator_replicas
-  historical_replicas       = var.historical_replicas
-  middlemanager_replicas    = var.middlemanager_replicas
-  overlord_replicas         = var.overlord_replicas
-  router_replicas           = var.router_replicas
+  namespace   = kubernetes_namespace.druid.metadata.0.name
+  druid_image = local.druid_image
+
+  broker_replicas        = var.broker_replicas
+  coordinator_replicas   = var.coordinator_replicas
+  historical_replicas    = var.historical_replicas
+  middlemanager_replicas = var.middlemanager_replicas
+  overlord_replicas      = var.overlord_replicas
+  router_replicas        = var.router_replicas
+
   tolerations_broker        = var.tolerations_broker
   tolerations_coordinator   = var.tolerations_coordinator
   tolerations_historical    = var.tolerations_historical
   tolerations_middlemanager = var.tolerations_middlemanager
   tolerations_overlord      = var.tolerations_overlord
   tolerations_router        = var.tolerations_router
+
+  enable_brokers_ingress      = var.enable_brokers_ingress
+  brokers_annotations_ingress = var.brokers_annotations_ingress
+  brokers_host                = var.brokers_host
+  enable_router_ingress       = var.enable_router_ingress
+  router_annotations_ingress  = var.router_annotations_ingress
+  router_host                 = var.router_host
 }

modules/druid/broker.tf

@@ -1,27 +1,3 @@
-resource "kubernetes_service" "broker_hs" {
-  metadata {
-    name      = "broker-hs"
-    namespace = var.namespace
-
-    labels = {
-      app = "broker"
-    }
-  }
-
-  spec {
-    port {
-      name = "broker"
-      port = 8082
-    }
-
-    selector = {
-      app = "broker"
-    }
-
-    cluster_ip = "None"
-  }
-}
-
 resource "kubernetes_service" "broker_cs" {
   metadata {
     name      = "broker-cs"
@@ -204,3 +180,28 @@ resource "kubernetes_deployment" "broker" {
     }
   }
 }
+
+resource "kubernetes_ingress" "brokers" {
+  count = var.enable_brokers_ingress ? 1 : 0
+
+  metadata {
+    name        = "brokers"
+    namespace   = var.namespace
+    annotations = var.brokers_annotations_ingress
+  }
+
+  spec {
+    rule {
+      host = var.brokers_host
+      http {
+        path {
+          path = "/"
+          backend {
+            service_name = kubernetes_service.broker_cs.metadata.0.name
+            service_port = kubernetes_service.broker_cs.spec.0.port.0.port
+          }
+        }
+      }
+    }
+  }
+}

modules/druid/coordinator.tf

@@ -1,27 +1,3 @@
-resource "kubernetes_service" "coordinator_hs" {
-  metadata {
-    name      = "coordinator-hs"
-    namespace = var.namespace
-
-    labels = {
-      app = "coordinator"
-    }
-  }
-
-  spec {
-    port {
-      name = "coordinator"
-      port = 8081
-    }
-
-    selector = {
-      app = "coordinator"
-    }
-
-    cluster_ip = "None"
-  }
-}
-
 resource "kubernetes_service" "coordinator_cs" {
   metadata {
     name      = "coordinator-cs"

modules/druid/historical.tf

@@ -1,27 +1,3 @@
-resource "kubernetes_service" "historical_hs" {
-  metadata {
-    name      = "historical-hs"
-    namespace = var.namespace
-
-    labels = {
-      app = "historical"
-    }
-  }
-
-  spec {
-    port {
-      name = "historical"
-      port = 8083
-    }
-
-    selector = {
-      app = "historical"
-    }
-
-    cluster_ip = "None"
-  }
-}
-
 resource "kubernetes_service" "historical_cs" {
   metadata {
     name      = "historical-cs"

modules/druid/middlemanager.tf

@@ -1,27 +1,3 @@
-resource "kubernetes_service" "mm_hs" {
-  metadata {
-    name      = "mm-hs"
-    namespace = var.namespace
-
-    labels = {
-      app = "middlemanager"
-    }
-  }
-
-  spec {
-    port {
-      name = "mm"
-      port = 8084
-    }
-
-    selector = {
-      app = "middlemanager"
-    }
-
-    cluster_ip = "None"
-  }
-}
-
 resource "kubernetes_service" "mm_cs" {
   metadata {
     name      = "mm-cs"

modules/druid/overlord.tf

@@ -1,27 +1,3 @@
-resource "kubernetes_service" "overlord_hs" {
-  metadata {
-    name      = "overlord-hs"
-    namespace = var.namespace
-
-    labels = {
-      app = "overlord"
-    }
-  }
-
-  spec {
-    port {
-      name = "overlord"
-      port = 8090
-    }
-
-    selector = {
-      app = "overlord"
-    }
-
-    cluster_ip = "None"
-  }
-}
-
 resource "kubernetes_service" "overlord_cs" {
   metadata {
     name      = "overlord-cs"

modules/druid/router.tf

@@ -1,27 +1,3 @@
-resource "kubernetes_service" "router_hs" {
-  metadata {
-    name      = "router-hs"
-    namespace = var.namespace
-
-    labels = {
-      app = "router"
-    }
-  }
-
-  spec {
-    port {
-      name = "router"
-      port = 8888
-    }
-
-    selector = {
-      app = "router"
-    }
-
-    cluster_ip = "None"
-  }
-}
-
 resource "kubernetes_service" "router_cs" {
   metadata {
     name      = "router-cs"
@@ -189,3 +165,28 @@ resource "kubernetes_deployment" "router" {
     }
   }
 }
+
+resource "kubernetes_ingress" "router" {
+  count = var.enable_router_ingress ? 1 : 0
+
+  metadata {
+    name        = "router"
+    namespace   = var.namespace
+    annotations = var.router_annotations_ingress
+  }
+
+  spec {
+    rule {
+      host = var.router_host
+      http {
+        path {
+          path = "/"
+          backend {
+            service_name = kubernetes_service.router_cs.metadata.0.name
+            service_port = kubernetes_service.router_cs.spec.0.port.0.port
+          }
+        }
+      }
+    }
+  }
+}

modules/druid/variables.tf

@@ -105,3 +105,40 @@ variable "tolerations_router" {
     value              = string
   }))
 }
+
+// ingress
+variable "enable_brokers_ingress" {
+  description = "enable the ingress object for the brokers for external access"
+  type        = bool
+  default     = false
+}
+
+variable "brokers_annotations_ingress" {
+  description = "list of annotations to add in the ingress object"
+  type        = map(string)
+  default     = {}
+}
+
+variable "brokers_host" {
+  description = "host to use for accessing the brokers"
+  type        = string
+  default     = ""
+}
+
+variable "enable_router_ingress" {
+  description = "enable the ingress object for the router for external access"
+  type        = bool
+  default     = false
+}
+
+variable "router_annotations_ingress" {
+  description = "list of annotations to add in the ingress object"
+  type        = map(string)
+  default     = {}
+}
+
+variable "router_host" {
+  description = "host to use for accessing the router"
+  type        = string
+  default     = ""
+}

variables.tf

@@ -131,6 +131,43 @@ variable "tolerations_router" {
   default = []
 }
 
+// Druid Ingress objects
+variable "enable_brokers_ingress" {
+  description = "enable the ingress object for the brokers for external access"
+  type        = bool
+  default     = false
+}
+
+variable "brokers_annotations_ingress" {
+  description = "list of annotations to add in the ingress object"
+  type        = map(string)
+  default     = {}
+}
+
+variable "brokers_host" {
+  description = "host to use for accessing the brokers"
+  type        = string
+  default     = ""
+}
+
+variable "enable_router_ingress" {
+  description = "enable the ingress object for the router for external access"
+  type        = bool
+  default     = false
+}
+
+variable "router_annotations_ingress" {
+  description = "list of annotations to add in the ingress object"
+  type        = map(string)
+  default     = {}
+}
+
+variable "router_host" {
+  description = "host to use for accessing the router"
+  type        = string
+  default     = ""
+}
+
 // Zookeeper variables
 variable "create_zookeeper" {
   description = "Controls if Zookeeper resources should be created (it affects almost all resources)"