From ec07e1e0bab58ae2ce48ed825eb8a5efe3d04931 Mon Sep 17 00:00:00 2001 From: Matteo Vitali Date: Mon, 11 Mar 2024 17:09:03 +0100 Subject: [PATCH 1/3] Fix traefik redirects service port --- .../environment/modules/kubernetes/routing/main.tf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf b/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf index 87fa0b6..b58603a 100644 --- a/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf +++ b/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf @@ -26,6 +26,8 @@ locals { tls_enabled = local.manual_certificate_enabled || local.letsencrypt_enabled tls_secret_name = local.tls_enabled ? "tls-certificate" : "" + + redirects_service_port = var.frontend_service_paths != [] ? var.frontend_service_port : var.backend_service_port } terraform { @@ -372,7 +374,7 @@ resource "kubernetes_manifest" "ingressroute_redirect_to_https" { services = [ { name = coalesce(var.frontend_service_slug, var.backend_service_slug) - port = coalesce(var.frontend_service_port, var.backend_service_port) + port = local.redirects_service_port } ] } @@ -430,7 +432,7 @@ resource "kubernetes_manifest" "ingressroute_secondary_domains_redirect" { services = [ { name = coalesce(var.frontend_service_slug, var.backend_service_slug) - port = coalesce(var.frontend_service_port, var.backend_service_port) + port = local.redirects_service_port } ] } From 3402338b77d98cc32099e7e03a99644815b47ba4 Mon Sep 17 00:00:00 2001 From: Matteo Vitali Date: Mon, 11 Mar 2024 17:44:58 +0100 Subject: [PATCH 2/3] Fix redirect-secondary-domains secretName --- .../terraform/environment/modules/kubernetes/routing/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf b/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf index b58603a..bf19c9c 100644 --- a/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf +++ b/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf @@ -440,7 +440,7 @@ resource "kubernetes_manifest" "ingressroute_secondary_domains_redirect" { }, local.letsencrypt_enabled ? { tls = { - secretName = "tls-letsencrypt" + secretName = local.tls_secret_name } } : {} ) From be1c4d98b092658a5723b36a1c098025cf0feca8 Mon Sep 17 00:00:00 2001 From: Matteo Vitali Date: Mon, 11 Mar 2024 19:02:57 +0100 Subject: [PATCH 3/3] Fix redirects_service_port condition --- .../terraform/environment/modules/kubernetes/routing/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf b/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf index bf19c9c..b2c6f46 100644 --- a/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf +++ b/{{cookiecutter.project_dirname}}/terraform/environment/modules/kubernetes/routing/main.tf @@ -27,7 +27,7 @@ locals { tls_secret_name = local.tls_enabled ? "tls-certificate" : "" - redirects_service_port = var.frontend_service_paths != [] ? var.frontend_service_port : var.backend_service_port + redirects_service_port = var.frontend_service_slug != "" ? var.frontend_service_port : var.backend_service_port } terraform {