Refacto and add modules

service/svc.tf

@@ -1,5 +1,5 @@
 locals {
-  app_slug = "${var.instance}${var.component==""?"":"-"}${var.component}"
+  app_slug = "${var.instance}${var.component == "" ? "" : "-"}${var.component}"
   cluster_ports = var.svc_type == "ClusterIP" ? [for idx, target in var.targets : {
     "name"       = target
     "port"       = var.ports[idx]
@@ -12,9 +12,10 @@ locals {
     "protocol"   = var.protocols[idx]
     "targetPort" = var.ports[idx]
   }] : []
-  lb_ports = var.svc_type == "LoadBalancer" ? [for idx, port in var.lb_ports : {
-    "port"       = port
-    "targetPort" = var.ports[idx]
+  lb_ports = var.svc_type == "LoadBalancer" ? [for port in var.lb_ports : {
+    "port"       = port.port.number
+    "name"       = port.name
+    "targetPort" = port.port.number
   }] : []
   node_ports = var.svc_type == "NodePort" ? [for idx, port in var.ports : {
     "port"       = port
@@ -23,35 +24,38 @@ locals {
   }] : []
   metadata = merge(
     {
-      "name"= "${local.app_slug}"
-      "namespace"= var.namespace
-      "labels"= var.labels
+      "name"      = local.app_slug
+      "namespace" = var.namespace
+      "labels"    = var.labels
     },
     length(var.annotations) > 0 ? {
-      "annotations"= var.annotations
+      "annotations" = var.annotations
     } : {}
   )
   spec = {
     "ClusterIP" = {
-      type     = "ClusterIP"
-      ports    = local.cluster_ports
-      selector = var.labels
+      type           = "ClusterIP"
+      ports          = local.cluster_ports
+      selector       = var.labels
+      ipFamilyPolicy = var.ip_family
     },
     "ExternalName" = {
-      type         = "ExternalName"
-      externalName = var.target_host
-      ports = local.ext_ports
+      type           = "ExternalName"
+      externalName   = var.target_host
+      ports          = local.ext_ports
     },
     "NodePort" = {
-      type     = "NodePort"
-      selector = var.labels
-      ports    = local.node_ports
+      type           = "NodePort"
+      selector       = var.labels
+      ports          = local.node_ports
+      ipFamilyPolicy = var.ip_family
     },
     "LoadBalancer" = {
-      type     = "LoadBalancer"
-      selector = var.labels
-      ports    = local.lb_ports
+      type                  = "LoadBalancer"
+      selector              = var.labels
+      ports                 = local.lb_ports
       externalTrafficPolicy = var.lb_policy
+      ipFamilyPolicy        = var.ip_family
     }
   }
 }
@@ -63,3 +67,18 @@ resource "kubectl_manifest" "service" {
     spec: ${jsonencode(local.spec[var.svc_type])}
   EOF
 }
+resource "kubectl_manifest" "endpoint" {
+  count     = var.svc_type == "ExternalName" ? 1 : 0
+  yaml_body = <<-EOF
+    apiVersion: v1
+    kind: Endpoints
+    metadata:
+      name: "${local.app_slug}"
+      namespace: "${var.namespace}"
+      labels: ${jsonencode(var.labels)}
+    subsets:
+      - addresses:
+          - ip: ${var.target_host}
+        ports:  ${jsonencode([for port in var.ports : { "port" = port }])}
+  EOF
+}