Skip to content

Commit 43fd8d8

Browse files
committed
Specify more memory for broker apps
1 parent 998addf commit 43fd8d8

File tree

1 file changed

+3
-38
lines changed

1 file changed

+3
-38
lines changed

application-boundary.tf

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
1-
data "cloudfoundry_space" "broker_space" {
1+
# For now we are using a hand-provisioned user-provided service, not managed by Terraform
2+
data "cloudfoundry_space" "broker-space" {
23
name = var.broker_space.space
34
org_name = var.broker_space.org
45
}
56

6-
module "broker_eks" {
7-
source = "./broker"
8-
9-
name = "ssb-eks"
10-
path = "./app-eks"
11-
broker_space = var.broker_space
12-
client_spaces = var.client_spaces
13-
enable_ssh = var.enable_ssh
14-
memory = 1024
15-
instances = 1
16-
aws_access_key_id = module.ssb-eks-broker-user.iam_access_key_id
17-
aws_secret_access_key = module.ssb-eks-broker-user.iam_access_key_secret
18-
aws_zone = var.broker_zone
19-
}
20-
217
module "broker_smtp" {
228
source = "./broker"
239

@@ -26,33 +12,12 @@ module "broker_smtp" {
2612
broker_space = var.broker_space
2713
client_spaces = var.client_spaces
2814
enable_ssh = var.enable_ssh
15+
memory = 1024
2916
aws_access_key_id = module.ssb-smtp-broker-user.iam_access_key_id
3017
aws_secret_access_key = module.ssb-smtp-broker-user.iam_access_key_secret
3118
aws_zone = var.broker_zone
3219
}
3320

34-
# For now we are using a hand-provisioned user-provided service, not managed by Terraform
35-
data "cloudfoundry_space" "broker-space" {
36-
name = var.broker_space.space
37-
org_name = var.broker_space.org
38-
}
39-
40-
resource "cloudfoundry_service_instance" "solrcloud_broker_k8s_cluster" {
41-
name = "ssb-solrcloud-k8s"
42-
space = data.cloudfoundry_space.broker_space.id
43-
service_plan = module.broker_eks.plans["aws-eks-service/raw"]
44-
tags = ["k8s"]
45-
json_params = "{\"mng_min_capacity\": 1, \"mng_max_capacity\": 1, \"mng_desired_capacity\": 1, \"mng_instance_types\": [\"t2.small\"]}"
46-
timeouts {
47-
create = "60m"
48-
update = "90m" # in case of an EKS destroy/create
49-
delete = "40m"
50-
}
51-
depends_on = [
52-
module.broker_eks
53-
]
54-
}
55-
5621
module "broker_solrcloud" {
5722
source = "./broker"
5823

0 commit comments

Comments
 (0)