Skip to content

Commit 9c3a8f6

Browse files
committed
Fix Helm Module and Ingress Manifest
1 parent 7c76cb8 commit 9c3a8f6

5 files changed

Lines changed: 21 additions & 21 deletions

File tree

.DS_Store

6 KB
Binary file not shown.

terraform/.DS_Store

6 KB
Binary file not shown.

terraform/dev/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ provider "kubernetes" {
1717
}
1818

1919
provider "helm" {
20-
kubernetes {
20+
kubernetes = {
2121
config_path = var.k8s_config_path
2222
}
2323
}

terraform/dev/yml_manifests/ingress-srv.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,42 @@ spec:
1111
- http:
1212
paths:
1313
- path: /api/users/?(.*)
14-
pathType: Prefix
14+
pathType: ImplementationSpecific
1515
backend:
1616
service:
1717
name: auth-srv
1818
port:
1919
number: 3000
2020
- path: /api/sneakers/?(.*)
21-
pathType: Prefix
21+
pathType: ImplementationSpecific
2222
backend:
2323
service:
2424
name: sneaker-srv
2525
port:
2626
number: 3001
2727
- path: /api/orders/?(.*)
28-
pathType: Prefix
28+
pathType: ImplementationSpecific
2929
backend:
3030
service:
3131
name: order-srv
3232
port:
3333
number: 3002
3434
- path: /api-docs/sneakers/?(.*)
35-
pathType: Prefix
35+
pathType: ImplementationSpecific
3636
backend:
3737
service:
3838
name: sneaker-srv
3939
port:
4040
number: 3001
4141
- path: /api/payments/?(.*)
42-
pathType: Prefix
42+
pathType: ImplementationSpecific
4343
backend:
4444
service:
4545
name: payment-srv
4646
port:
4747
number: 3003
4848
- path: /zipkin
49-
pathType: Prefix
49+
pathType: ImplementationSpecific
5050
backend:
5151
service:
5252
name: zipkin-service

terraform/modules/helm/main.tf

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ resource "helm_release" "grafana" {
1919
chart = "grafana"
2020
namespace = "default"
2121

22-
set {
23-
name = "service.type"
24-
value = "NodePort"
25-
}
26-
27-
set {
28-
name = "adminUser"
29-
value = var.grafana_admin_username
30-
}
31-
32-
set {
33-
name = "adminPassword"
34-
value = var.grafana_admin_password
35-
}
22+
set = [
23+
{
24+
name = "service.type"
25+
value = "NodePort"
26+
},
27+
{
28+
name = "adminUser"
29+
value = var.grafana_admin_username
30+
},
31+
{
32+
name = "adminPassword"
33+
value = var.grafana_admin_password
34+
}
35+
]
3636
}
3737

3838

0 commit comments

Comments
 (0)