Skip to content

Commit 2e2b500

Browse files
EXO-6: [FIX] update main.tf - refactor dns_names
1 parent cbc0230 commit 2e2b500

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
lines changed

kubernetes/ingress/locals.tf

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
locals {
2+
name = "${var.name}-${replace(var.dns_name, "_","-")}"
3+
}

kubernetes/ingress/main.tf

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
resource "kubernetes_ingress_v1" "generic-ingress" {
2-
for_each = toset(var.dns_names)
32
metadata {
4-
name = "${var.name}-${replace(each.key, "_","-")}"
3+
name = local.name
54
labels = {
6-
app = "${var.name}-${replace(each.key, "_","-")}"
5+
app = local.name
76
}
87
annotations = {
9-
"cert-manager.io/cluster-issuer": "letsencrypt-prod"
8+
"cert-manager.io/cluster-issuer" : "letsencrypt-prod" // unsued on cf
109
"kubernetes.io/ingress.class" : "default"
1110
"haproxy.org/check" : "false" // todo: use http-check
1211
"haproxy.org/check-http" : "/health.txt"
@@ -15,7 +14,7 @@ resource "kubernetes_ingress_v1" "generic-ingress" {
1514
}
1615
spec {
1716
rule {
18-
host = each.value
17+
host = var.dns_name
1918
http {
2019
path {
2120
path = "/"
@@ -32,8 +31,8 @@ resource "kubernetes_ingress_v1" "generic-ingress" {
3231
}
3332

3433
tls {
35-
hosts = [each.value]
36-
secret_name = each.value
34+
hosts = [var.dns_name]
35+
secret_name = var.dns_name
3736
}
3837
}
3938
}

kubernetes/ingress/variable.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ variable "name" {
22
type = string
33
}
44

5-
variable "dns_names" {
6-
type = list(string)
5+
variable "dns_name" {
6+
type = string
77
}

main.tf

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
module "kubernetes-deployment-v1" {
2-
source = "./kubernetes/deployment_v1"
3-
image = var.image
4-
name = var.name
5-
requests_cpu = var.requests_cpu
2+
source = "./kubernetes/deployment_v1"
3+
image = var.image
4+
name = var.name
5+
requests_cpu = var.requests_cpu
66
requests_memory = var.requests_memory
77
}
88

99
module "kubernetes-service" {
10-
source = "./kubernetes/service"
11-
name = var.name
10+
source = "./kubernetes/service"
11+
name = var.name
1212
target_port = var.target_port
1313
}
1414

1515
module "kubernetes-ingress" {
16-
source = "./kubernetes/ingress"
17-
dns_names = var.dns_names
18-
name = var.name
16+
source = "./kubernetes/ingress"
17+
dns_name = var.dns_name
18+
name = var.name
1919
}

variables.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ variable "name" {
33
default = "deployment"
44
}
55

6-
variable "dns_names" {
7-
type = list(string)
8-
default = ["example.com"]
6+
variable "dns_name" {
7+
type = string
8+
default = "example.com"
99
}
1010

1111
variable "target_port" {

0 commit comments

Comments
 (0)