fix

modules/ingress/ingress.tf

@@ -19,11 +19,11 @@ resource "kubectl_manifest" "prj_certificate" {
     apiVersion: "cert-manager.io/v1"
     kind: "Certificate"
     metadata:
-      name: "${var.instance}"
+      name: "${var.instance}${var.component==""?:"":"-"}${var.component}"
       namespace: "${var.namespace}"
       labels: ${jsonencode(var.labels)}
     spec:
-        secretName: "${var.instance}-cert"
+        secretName: "${var.instance}${var.component==""?:"":"-"}${var.component}-cert"
         dnsNames: ${jsonencode(var.dns-names)}
         issuerRef:
           name: "${var.issuer}"
@@ -33,6 +33,7 @@ resource "kubectl_manifest" "prj_certificate" {
 }
 
 resource "kubectl_manifest" "prj_https_redirect" {
+  count = var.component==""?1:0
   yaml_body  = <<-EOF
     apiVersion: "traefik.containo.us/v1alpha1"
     kind: "Middleware"
@@ -53,16 +54,16 @@ resource "kubectl_manifest" "prj_ingress" {
     apiVersion: "networking.k8s.io/v1"
     kind: "Ingress"
     metadata:
-      name: "${var.instance}"
+      name: "${var.instance}${var.component==""?:"":"-"}${var.component}"
       namespace: "${var.namespace}"
       labels: ${jsonencode(var.labels)}
       annotations:
-        "traefik.ingress.kubernetes.io/router.middlewares": "${join(",", [for m in var.middlewares : format("%s-%s@kubernetescrd", var.namespace, m)])}"
+        "traefik.ingress.kubernetes.io/router.middlewares": "${join(",", [for m in concat(["${var.instance}-https"],var.middlewares) : format("%s-%s@kubernetescrd", var.namespace, m)])}"
     spec:
       ingressClassName: "${var.ingress-class}"
       rules: ${jsonencode(local.rules)}
       tls:
       - hosts: ${jsonencode(var.dns-names)}
-        secretName: "${var.instance}-cert"
+        secretName: "${var.instance}${var.component==""?:"":"-"}${var.component}-cert"
   EOF
 }

modules/ingress/variables.tf

@@ -22,7 +22,7 @@ variable "dns-names" {
 }
 variable "middlewares" {
   type        = list(string)
+  default     = []
 }
 variable "service" {
 }
-