Skip to content

Commit 99e1fc1

Browse files
Update terraform files to use new format (#229)
A change in the terraform format broke local cluster management. This PR fixes that by updating files to new spec.
1 parent a9e999f commit 99e1fc1

File tree

4 files changed

+71
-78
lines changed

4 files changed

+71
-78
lines changed

src/vibe_core/vibe_core/terraform/local/modules/kubernetes/dapr.tf

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ resource "helm_release" "dapr" {
1414
namespace = "dapr-system"
1515
version = "1.13.3"
1616

17-
set {
18-
name = "dapr_operator.watchInterval"
19-
value = "30s"
20-
}
21-
22-
set {
23-
name = "enable-ha"
24-
value = "true"
25-
}
17+
set = [
18+
{
19+
name = "dapr_operator.watchInterval"
20+
value = "30s"
21+
},
22+
{
23+
name = "enable-ha"
24+
value = "true"
25+
}
26+
]
2627

2728
depends_on = [kubernetes_namespace.kubernetesdaprnamespace]
2829
}

src/vibe_core/vibe_core/terraform/local/modules/kubernetes/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ provider "kubernetes" {
3838
}
3939

4040
provider "helm" {
41-
kubernetes {
41+
kubernetes = {
4242
config_path = var.kubernetes_config_path
4343
config_context = var.kubernetes_config_context
4444
}

src/vibe_core/vibe_core/terraform/local/modules/kubernetes/rabbitmq.tf

Lines changed: 42 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,55 +8,48 @@ resource "helm_release" "rabbitmq" {
88
chart = "rabbitmq"
99
namespace = var.namespace
1010

11-
set {
12-
name = "image.tag"
13-
value = var.rabbitmq_image_tag
14-
}
15-
16-
set {
17-
name = "containerPorts.amqp"
18-
value = "5672"
19-
}
20-
21-
set {
22-
name = "containerPorts.amqpTls"
23-
value = "5671"
24-
}
25-
26-
set {
27-
name = "containerPorts.dist"
28-
value = "25672"
29-
}
30-
31-
set {
32-
name = "containerPorts.manager"
33-
value = "15672"
34-
}
35-
36-
set {
37-
name = "containerPorts.epmd"
38-
value = "4369"
39-
}
40-
41-
set {
42-
name = "containerPorts.metrics"
43-
value = "9419"
44-
}
45-
46-
set {
47-
name = "replica.replicaCount"
48-
value = "1"
49-
}
50-
51-
set {
52-
name = "extraEnvVars[0].name"
53-
value = "RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS"
54-
}
55-
56-
set {
57-
name = "extraEnvVars[0].value"
58-
value = "-rabbit consumer_timeout 10800000"
59-
}
11+
set = [
12+
{
13+
name = "image.tag"
14+
value = var.rabbitmq_image_tag
15+
},
16+
{
17+
name = "containerPorts.amqp"
18+
value = "5672"
19+
},
20+
{
21+
name = "containerPorts.amqpTls"
22+
value = "5671"
23+
},
24+
{
25+
name = "containerPorts.dist"
26+
value = "25672"
27+
},
28+
{
29+
name = "containerPorts.manager"
30+
value = "15672"
31+
},
32+
{
33+
name = "containerPorts.epmd"
34+
value = "4369"
35+
},
36+
{
37+
name = "containerPorts.metrics"
38+
value = "9419"
39+
},
40+
{
41+
name = "replica.replicaCount"
42+
value = "1"
43+
},
44+
{
45+
name = "extraEnvVars[0].name"
46+
value = "RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS"
47+
},
48+
{
49+
name = "extraEnvVars[0].value"
50+
value = "-rabbit consumer_timeout 10800000"
51+
}
52+
]
6053
}
6154

6255
data "kubernetes_service" "rabbitmq" {

src/vibe_core/vibe_core/terraform/local/modules/kubernetes/redis.tf

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,24 @@ resource "helm_release" "redis" {
88
chart = "redis"
99
namespace = var.namespace
1010

11-
set {
12-
name = "commonConfiguration"
13-
value = "appendonly no"
14-
}
15-
16-
set {
17-
name = "master.containerPort"
18-
value = "6379"
19-
}
20-
21-
set {
22-
name = "image.tag"
23-
value = var.redis_image_tag
24-
}
25-
26-
set {
27-
name = "replica.replicaCount"
28-
value = "0"
29-
}
11+
set = [
12+
{
13+
name = "commonConfiguration"
14+
value = "appendonly no"
15+
},
16+
{
17+
name = "master.containerPort"
18+
value = "6379"
19+
},
20+
{
21+
name = "image.tag"
22+
value = var.redis_image_tag
23+
},
24+
{
25+
name = "replica.replicaCount"
26+
value = "0"
27+
}
28+
]
3029
}
3130

3231
data "kubernetes_service" "redis" {

0 commit comments

Comments
 (0)