Refacto and add modules

ingress/ingress.tf

@@ -1,24 +1,25 @@
 
 locals {
-  app_slug = "${var.instance}${var.component==""?"":"-"}${var.component}"
+  app_slug = "${var.instance}${var.component == "" ? "" : "-"}${var.component}"
   pres_labels = merge(var.labels, {
     "app.kubernetes.io/component" = "presentation"
   })
   rules = [for v in var.dns_names : {
     "host" = "${v}"
     "http" = {
-      "paths" = [for idx, svc in var.services : {
-        "path"     = "/${var.sub_paths[idx]}"
+      "paths" = [for mapper in var.services_mapping : {
+        "path"     = "/${mapper.path}"
         "pathType" = "Prefix"
         "backend" = {
-          "service" = svc
+          "service" = mapper.service
         }
       }]
     }
   }]
-  tls = var.enforce_tls ? [
+  secret_name = var.cert_name != "" ? var.cert_name : "${local.app_slug}-cert"
+  tls = var.entrypoint == "" || length(regexall(".*websecure.*", var.entrypoint)) > 0 ? [
     {
-      secretName = var.cert_name != "" ? var.cert_name : "${local.app_slug}-cert"
+      secretName = local.secret_name
       hosts      = var.dns_names
     }
   ] : []
@@ -36,8 +37,8 @@ locals {
   )
 }
 
-resource "kubectl_manifest" "prj_certificate" {
-  count     = var.create_cert ? 1 : 0
+resource "kubectl_manifest" "certificate" {
+  count     = var.cert_name == "" ? 1 : 0
   yaml_body = <<-EOF
     apiVersion: "cert-manager.io/v1"
     kind: "Certificate"
@@ -46,7 +47,7 @@ resource "kubectl_manifest" "prj_certificate" {
       namespace: "${var.namespace}"
       labels: ${jsonencode(local.pres_labels)}
     spec:
-        secretName: "${local.app_slug}-cert"
+        secretName: "${local.secret_name}"
         dnsNames: ${jsonencode(var.dns_names)}
         issuerRef:
           kind: "ClusterIssuer"
@@ -55,8 +56,8 @@ resource "kubectl_manifest" "prj_certificate" {
   EOF
 }
 
-resource "kubectl_manifest" "prj_https_redirect" {
-  count     = var.create_redirect || var.component == "" ? 1 : 0
+resource "kubectl_manifest" "https_redirect" {
+  count     = var.create_redirect ? 1 : 0
   yaml_body = <<-EOF
     apiVersion: "traefik.io/v1alpha1"
     kind: "Middleware"
@@ -71,7 +72,7 @@ resource "kubectl_manifest" "prj_https_redirect" {
   EOF
 }
 
-resource "kubectl_manifest" "prj_ingress" {
+resource "kubectl_manifest" "ingress" {
   force_conflicts = true
   yaml_body       = <<-EOF
     apiVersion: "networking.k8s.io/v1"