File tree Expand file tree Collapse file tree 8 files changed +26
-77
lines changed Expand file tree Collapse file tree 8 files changed +26
-77
lines changed Original file line number Diff line number Diff line change @@ -12,12 +12,20 @@ resource "random_id" "random" {
12
12
# ## Hybrid account
13
13
# ###############################################################################
14
14
15
+ module "base" {
16
+ source = " ../base"
17
+
18
+ prefix = local. environment
19
+ aws_region = local. aws_region
20
+ }
21
+
22
+
15
23
module "runners" {
16
24
source = " ../../"
17
25
create_service_linked_role_spot = true
18
26
aws_region = local. aws_region
19
- vpc_id = module. vpc . vpc_id
20
- subnet_ids = module. vpc . private_subnets
27
+ vpc_id = module. base . vpc . vpc_id
28
+ subnet_ids = module. base . vpc . private_subnets
21
29
22
30
prefix = local. environment
23
31
tags = {
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -9,6 +9,12 @@ locals {
9
9
resource "random_id" "random" {
10
10
byte_length = 20
11
11
}
12
+ module "base" {
13
+ source = " ../base"
14
+
15
+ prefix = local. environment
16
+ aws_region = local. aws_region
17
+ }
12
18
13
19
module "multi-runner" {
14
20
source = " ../../modules/multi-runner"
@@ -37,8 +43,8 @@ module "multi-runner" {
37
43
# }
38
44
# }
39
45
aws_region = local. aws_region
40
- vpc_id = module. vpc . vpc_id
41
- subnet_ids = module. vpc . private_subnets
46
+ vpc_id = module. base . vpc . vpc_id
47
+ subnet_ids = module. base . vpc . private_subnets
42
48
runners_scale_up_lambda_timeout = 60
43
49
runners_scale_down_lambda_timeout = 60
44
50
prefix = local. environment
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -23,6 +23,12 @@ resource "aws_kms_alias" "github" {
23
23
name = " alias/github/action-runners"
24
24
target_key_id = aws_kms_key. github . key_id
25
25
}
26
+ module "base" {
27
+ source = " ../base"
28
+
29
+ prefix = local. environment
30
+ aws_region = local. aws_region
31
+ }
26
32
27
33
module "runners" {
28
34
source = " ../../"
@@ -31,8 +37,8 @@ module "runners" {
31
37
}
32
38
33
39
aws_region = local. aws_region
34
- vpc_id = module. vpc . vpc_id
35
- subnet_ids = module. vpc . private_subnets
40
+ vpc_id = module. base . vpc . vpc_id
41
+ subnet_ids = module. base . vpc . private_subnets
36
42
kms_key_arn = aws_kms_key. github . key_id
37
43
38
44
prefix = local. environment
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -45,7 +45,6 @@ terraform apply
45
45
| ------| --------| ---------|
46
46
| <a name =" module_base " ></a > [ base] ( #module\_ base ) | ../base | n/a |
47
47
| <a name =" module_runners " ></a > [ runners] ( #module\_ runners ) | ../../ | n/a |
48
- | <a name =" module_vpc " ></a > [ vpc] ( #module\_ vpc ) | terraform-aws-modules/vpc/aws | 3.11.2 |
49
48
50
49
## Resources
51
50
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments