Skip to content

Commit 0e5e2c7

Browse files
author
C. Weaver
committed
Rewrite for kubernetes provider 2 and recent kubernetes versions
1 parent 7d19f91 commit 0e5e2c7

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

main.tf

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ resource "kubernetes_deployment" "deployment" {
5656
}
5757

5858
resources {
59-
limits {
59+
limits = {
6060
cpu = var.resource_limits.cpu
6161
memory = var.resource_limits.memory
6262
}
63-
requests {
63+
requests = {
6464
cpu = var.resource_requests.cpu
6565
memory = var.resource_requests.memory
6666
}
@@ -168,7 +168,7 @@ resource "kubernetes_service" "load_balancer" {
168168
}
169169
}
170170

171-
resource "kubernetes_ingress" "ingress" {
171+
resource "kubernetes_ingress_v1" "ingress" {
172172
metadata {
173173
name = "${var.app_name}-ingress"
174174
annotations = {
@@ -181,9 +181,13 @@ resource "kubernetes_ingress" "ingress" {
181181
}
182182

183183
spec {
184-
backend {
185-
service_name = var.app_name
186-
service_port = 80
184+
default_backend {
185+
service {
186+
name = var.app_name
187+
port {
188+
number = 80
189+
}
190+
}
187191
}
188192

189193
tls {
@@ -195,8 +199,12 @@ resource "kubernetes_ingress" "ingress" {
195199
path {
196200
path = "/*"
197201
backend {
198-
service_name = "ssl-redirect"
199-
service_port = "use-annotation"
202+
service {
203+
name = "ssl-redirect"
204+
port {
205+
name = "use-annotation"
206+
}
207+
}
200208
}
201209
}
202210
}
@@ -211,8 +219,12 @@ resource "kubernetes_ingress" "ingress" {
211219
path = "/"
212220

213221
backend {
214-
service_name = var.app_name
215-
service_port = 80
222+
service {
223+
name = var.app_name
224+
port {
225+
number = 80
226+
}
227+
}
216228
}
217229
}
218230
}
@@ -225,7 +237,7 @@ resource "aws_route53_record" "external_dns" {
225237
name = local.hostname
226238
type = "CNAME"
227239
ttl = "5"
228-
records = kubernetes_service.load_balancer.load_balancer_ingress[*].hostname
240+
records = [kubernetes_service.load_balancer.status[0].load_balancer[0].ingress[0].hostname]
229241
}
230242

231243
resource "aws_route53_record" "internal_dns" {
@@ -234,7 +246,7 @@ resource "aws_route53_record" "internal_dns" {
234246
name = local.hostname
235247
type = "CNAME"
236248
ttl = "5"
237-
records = kubernetes_service.load_balancer.load_balancer_ingress[*].hostname
249+
records = [kubernetes_service.load_balancer.status[0].load_balancer[0].ingress[0].hostname]
238250
}
239251

240252
/* IAM:

0 commit comments

Comments
 (0)