Skip to content

Commit a8b4e37

Browse files
aknyshaknysh
authored
Update examples and module versions (#16)
* Update variables * Add Makefiles * Update examples * Bump module versions * Update `README` * Update `README`. Remove Makefiles
1 parent eb3a1b7 commit a8b4e37

File tree

6 files changed

+58
-134
lines changed

6 files changed

+58
-134
lines changed

‎README.md

+28-66
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,10 @@ module "jenkins" {
7575
aws_account_id = "000111222333"
7676
aws_region = "us-west-2"
7777
availability_zones = ["${data.aws_availability_zones.available.names}"]
78-
solution_stack_name = "64bit Amazon Linux 2017.03 v2.7.4 running Docker 17.03.2-ce"
7978
vpc_id = "vpc-a22222ee"
8079
zone_id = "ZXXXXXXXXXXX"
8180
public_subnets = ["subnet-e63f82cb", "subnet-e66f44ab", "subnet-e88f42bd"]
8281
private_subnets = ["subnet-e99d23eb", "subnet-e77e12bb", "subnet-e58a52bc"]
83-
loadbalancer_type = "application"
8482
loadbalancer_certificate_arn = "XXXXXXXXXXXXXXXXX"
8583
ssh_key_pair = "ssh-key-jenkins"
8684
@@ -89,10 +87,6 @@ module "jenkins" {
8987
github_repo_name = "jenkins"
9088
github_branch = "master"
9189
92-
build_image = "aws/codebuild/docker:1.12.1"
93-
build_compute_type = "BUILD_GENERAL1_SMALL"
94-
image_tag = "latest"
95-
9690
datapipeline_config = {
9791
instance_type = "t2.medium"
9892
email = "[email protected]"
@@ -106,9 +100,6 @@ module "jenkins" {
106100
JENKINS_NUM_EXECUTORS = 4
107101
}
108102
109-
delimiter = "-"
110-
attributes = []
111-
112103
tags = {
113104
BusinessUnit = "ABC"
114105
Department = "XYZ"
@@ -132,12 +123,10 @@ module "jenkins" {
132123
aws_account_id = "000111222333"
133124
aws_region = "us-west-2"
134125
availability_zones = ["${data.aws_availability_zones.available.names}"]
135-
solution_stack_name = "64bit Amazon Linux 2017.03 v2.7.4 running Docker 17.03.2-ce"
136126
vpc_id = "vpc-a22222ee"
137127
zone_id = "ZXXXXXXXXXXX"
138128
public_subnets = "${module.subnets.public_subnet_ids}"
139129
private_subnets = "${module.subnets.private_subnet_ids}"
140-
loadbalancer_type = "application"
141130
loadbalancer_certificate_arn = "XXXXXXXXXXXXXXXXX"
142131
ssh_key_pair = "ssh-key-jenkins"
143132
@@ -146,10 +135,6 @@ module "jenkins" {
146135
github_repo_name = "jenkins"
147136
github_branch = "master"
148137
149-
build_image = "aws/codebuild/docker:1.12.1"
150-
build_compute_type = "BUILD_GENERAL1_SMALL"
151-
image_tag = "latest"
152-
153138
datapipeline_config = {
154139
instance_type = "t2.medium"
155140
email = "[email protected]"
@@ -163,31 +148,23 @@ module "jenkins" {
163148
JENKINS_NUM_EXECUTORS = 4
164149
}
165150
166-
delimiter = "-"
167-
attributes = []
168-
169151
tags = {
170152
BusinessUnit = "ABC"
171153
Department = "XYZ"
172154
}
173155
}
174156
175157
module "subnets" {
176-
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=master"
177-
availability_zones = ["${data.aws_availability_zones.available.names}"]
178-
namespace = "cp"
179-
name = "jenkins"
180-
stage = "prod"
181-
region = "us-west-2"
182-
vpc_id = "vpc-a22222ee"
183-
igw_id = "igw-s32321vd"
184-
cidr_block = "10.0.0.0/16"
185-
nat_gateway_enabled = "true"
186-
vpc_default_route_table_id = "ZXXXXXXXXXXX"
187-
public_network_acl_id = "ZXXXXXXXXXXX"
188-
private_network_acl_id = "ZXXXXXXXXXXX"
189-
delimiter = "-"
190-
attributes = ["subnet"]
158+
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=master"
159+
availability_zones = ["${data.aws_availability_zones.available.names}"]
160+
namespace = "cp"
161+
name = "jenkins"
162+
stage = "prod"
163+
region = "us-west-2"
164+
vpc_id = "vpc-a22222ee"
165+
igw_id = "igw-s32321vd"
166+
cidr_block = "10.0.0.0/16"
167+
nat_gateway_enabled = "true"
191168
192169
tags = {
193170
BusinessUnit = "ABC"
@@ -212,12 +189,10 @@ module "jenkins" {
212189
aws_account_id = "000111222333"
213190
aws_region = "us-west-2"
214191
availability_zones = ["${data.aws_availability_zones.available.names}"]
215-
solution_stack_name = "64bit Amazon Linux 2017.03 v2.7.4 running Docker 17.03.2-ce"
216192
vpc_id = "${module.vpc.vpc_id}"
217193
zone_id = "ZXXXXXXXXXXX"
218194
public_subnets = "${module.subnets.public_subnet_ids}"
219195
private_subnets = "${module.subnets.private_subnet_ids}"
220-
loadbalancer_type = "application"
221196
loadbalancer_certificate_arn = "XXXXXXXXXXXXXXXXX"
222197
ssh_key_pair = "ssh-key-jenkins"
223198
@@ -226,10 +201,6 @@ module "jenkins" {
226201
github_repo_name = "jenkins"
227202
github_branch = "master"
228203
229-
build_image = "aws/codebuild/docker:1.12.1"
230-
build_compute_type = "BUILD_GENERAL1_SMALL"
231-
image_tag = "latest"
232-
233204
datapipeline_config = {
234205
instance_type = "t2.medium"
235206
email = "[email protected]"
@@ -243,23 +214,19 @@ module "jenkins" {
243214
JENKINS_NUM_EXECUTORS = 4
244215
}
245216
246-
delimiter = "-"
247-
attributes = []
248-
249217
tags = {
250218
BusinessUnit = "ABC"
251219
Department = "XYZ"
252220
}
253221
}
254222
255223
module "vpc" {
256-
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=master"
257-
namespace = "cp"
258-
name = "jenkins"
259-
stage = "prod"
260-
cidr_block = "10.0.0.0/16"
261-
delimiter = "-"
262-
attributes = ["vpc"]
224+
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=master"
225+
namespace = "cp"
226+
name = "jenkins"
227+
stage = "prod"
228+
cidr_block = "10.0.0.0/16"
229+
assign_generated_ipv6_cidr_block = "true"
263230
264231
tags = {
265232
BusinessUnit = "ABC"
@@ -268,21 +235,16 @@ module "vpc" {
268235
}
269236
270237
module "subnets" {
271-
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=master"
272-
availability_zones = ["${data.aws_availability_zones.available.names}"]
273-
namespace = "cp"
274-
name = "jenkins"
275-
stage = "prod"
276-
region = "us-west-2"
277-
vpc_id = "${module.vpc.vpc_id}"
278-
igw_id = "${module.vpc.igw_id}"
279-
cidr_block = "10.0.0.0/16"
280-
nat_gateway_enabled = "true"
281-
vpc_default_route_table_id = "${module.vpc.vpc_default_route_table_id}"
282-
public_network_acl_id = "${module.vpc.vpc_default_network_acl_id}"
283-
private_network_acl_id = "${module.vpc.vpc_default_network_acl_id}"
284-
delimiter = "-"
285-
attributes = ["subnet"]
238+
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=master"
239+
availability_zones = ["${data.aws_availability_zones.available.names}"]
240+
namespace = "cp"
241+
name = "jenkins"
242+
stage = "prod"
243+
region = "us-west-2"
244+
vpc_id = "${module.vpc.vpc_id}"
245+
igw_id = "${module.vpc.igw_id}"
246+
cidr_block = "${module.vpc.vpc_cidr_block}"
247+
nat_gateway_enabled = "true"
286248
287249
tags = {
288250
BusinessUnit = "ABC"
@@ -301,7 +263,7 @@ module "subnets" {
301263
| name | jenkins | Name of the application | Yes |
302264
| description | | Used as Elastic Beanstalk application description | Yes |
303265
| aws_region | us-west-2 | AWS Region to provision all the AWS resources in | Yes |
304-
| solution_stack_name | 64bit Amazon Linux 2017.03 v2.7.4 running Docker 17.03.2-ce | Elastic Beanstalk stack | Yes |
266+
| solution_stack_name | 64bit Amazon Linux 2017.09 v2.8.3 running Docker 17.06.2-ce | Elastic Beanstalk stack | Yes |
305267
| master_instance_type | t2.medium | EC2 instance type for Jenkins master | Yes |
306268
| vpc_id | | AWS VPC ID where module should operate (_e.g._ `vpc-a22222ee`) | Yes |
307269
| availability_zones | | List of Availability Zones for EFS | Yes |
@@ -335,7 +297,7 @@ module "subnets" {
335297

336298
| Name | Default | Description | Required |
337299
|:--------------------|:------------:|:---------------------------------------------------------------------------|:--------:|
338-
| instance_type | t2.micro | Instance type to use in DataPipeline | Yes |
300+
| instance_type | t2.small | Instance type to use in DataPipeline | Yes |
339301
| email | "" | Email to use in SNS. Needs to be provided, otherwise the module will fail | Yes |
340302
| period | 24 hours | Frequency of pipeline execution (frequency of backups) | Yes |
341303
| timeout | 60 Minutes | Pipeline execution timeout | Yes |

‎examples/existing_vpc_existing_subnets/main.tf

-9
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ module "jenkins" {
1515
aws_account_id = "000111222333"
1616
aws_region = "us-west-2"
1717
availability_zones = ["${data.aws_availability_zones.available.names}"]
18-
solution_stack_name = "64bit Amazon Linux 2017.03 v2.7.4 running Docker 17.03.2-ce"
1918
vpc_id = "vpc-a22222ee"
2019
zone_id = "ZXXXXXXXXXXX"
2120
public_subnets = ["subnet-e63f82cb", "subnet-e66f44ab", "subnet-e88f42bd"]
2221
private_subnets = ["subnet-e99d23eb", "subnet-e77e12bb", "subnet-e58a52bc"]
23-
loadbalancer_type = "application"
2422
loadbalancer_certificate_arn = "XXXXXXXXXXXXXXXXX"
2523
ssh_key_pair = "ssh-key-jenkins"
2624

@@ -29,10 +27,6 @@ module "jenkins" {
2927
github_repo_name = "jenkins"
3028
github_branch = "master"
3129

32-
build_image = "aws/codebuild/docker:1.12.1"
33-
build_compute_type = "BUILD_GENERAL1_SMALL"
34-
image_tag = "latest"
35-
3630
datapipeline_config = {
3731
instance_type = "t2.medium"
3832
email = "[email protected]"
@@ -46,9 +40,6 @@ module "jenkins" {
4640
JENKINS_NUM_EXECUTORS = 4
4741
}
4842

49-
delimiter = "-"
50-
attributes = []
51-
5243
tags = {
5344
BusinessUnit = "ABC"
5445
Department = "XYZ"

‎examples/existing_vpc_new_subnets/main.tf

+10-24
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ module "jenkins" {
1515
aws_account_id = "000111222333"
1616
aws_region = "us-west-2"
1717
availability_zones = ["${data.aws_availability_zones.available.names}"]
18-
solution_stack_name = "64bit Amazon Linux 2017.03 v2.7.4 running Docker 17.03.2-ce"
1918
vpc_id = "vpc-a22222ee"
2019
zone_id = "ZXXXXXXXXXXX"
2120
public_subnets = "${module.subnets.public_subnet_ids}"
2221
private_subnets = "${module.subnets.private_subnet_ids}"
23-
loadbalancer_type = "application"
2422
loadbalancer_certificate_arn = "XXXXXXXXXXXXXXXXX"
2523
ssh_key_pair = "ssh-key-jenkins"
2624

@@ -29,10 +27,6 @@ module "jenkins" {
2927
github_repo_name = "jenkins"
3028
github_branch = "master"
3129

32-
build_image = "aws/codebuild/docker:1.12.1"
33-
build_compute_type = "BUILD_GENERAL1_SMALL"
34-
image_tag = "latest"
35-
3630
datapipeline_config = {
3731
instance_type = "t2.medium"
3832
email = "[email protected]"
@@ -46,31 +40,23 @@ module "jenkins" {
4640
JENKINS_NUM_EXECUTORS = 4
4741
}
4842

49-
delimiter = "-"
50-
attributes = []
51-
5243
tags = {
5344
BusinessUnit = "ABC"
5445
Department = "XYZ"
5546
}
5647
}
5748

5849
module "subnets" {
59-
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=master"
60-
availability_zones = ["${data.aws_availability_zones.available.names}"]
61-
namespace = "cp"
62-
name = "jenkins"
63-
stage = "prod"
64-
region = "us-west-2"
65-
vpc_id = "vpc-a22222ee"
66-
igw_id = "igw-s32321vd"
67-
cidr_block = "10.0.0.0/16"
68-
nat_gateway_enabled = "true"
69-
vpc_default_route_table_id = "ZXXXXXXXXXXX"
70-
public_network_acl_id = "ZXXXXXXXXXXX"
71-
private_network_acl_id = "ZXXXXXXXXXXX"
72-
delimiter = "-"
73-
attributes = ["subnet"]
50+
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=master"
51+
availability_zones = ["${data.aws_availability_zones.available.names}"]
52+
namespace = "cp"
53+
name = "jenkins"
54+
stage = "prod"
55+
region = "us-west-2"
56+
vpc_id = "vpc-a22222ee"
57+
igw_id = "igw-s32321vd"
58+
cidr_block = "10.0.0.0/16"
59+
nat_gateway_enabled = "true"
7460

7561
tags = {
7662
BusinessUnit = "ABC"

‎examples/new_vpc_new_subnets/main.tf

+16-31
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ module "jenkins" {
1515
aws_account_id = "000111222333"
1616
aws_region = "us-west-2"
1717
availability_zones = ["${data.aws_availability_zones.available.names}"]
18-
solution_stack_name = "64bit Amazon Linux 2017.03 v2.7.4 running Docker 17.03.2-ce"
1918
vpc_id = "${module.vpc.vpc_id}"
2019
zone_id = "ZXXXXXXXXXXX"
2120
public_subnets = "${module.subnets.public_subnet_ids}"
2221
private_subnets = "${module.subnets.private_subnet_ids}"
23-
loadbalancer_type = "application"
2422
loadbalancer_certificate_arn = "XXXXXXXXXXXXXXXXX"
2523
ssh_key_pair = "ssh-key-jenkins"
2624

@@ -29,10 +27,6 @@ module "jenkins" {
2927
github_repo_name = "jenkins"
3028
github_branch = "master"
3129

32-
build_image = "aws/codebuild/docker:1.12.1"
33-
build_compute_type = "BUILD_GENERAL1_SMALL"
34-
image_tag = "latest"
35-
3630
datapipeline_config = {
3731
instance_type = "t2.medium"
3832
email = "[email protected]"
@@ -46,23 +40,19 @@ module "jenkins" {
4640
JENKINS_NUM_EXECUTORS = 4
4741
}
4842

49-
delimiter = "-"
50-
attributes = []
51-
5243
tags = {
5344
BusinessUnit = "ABC"
5445
Department = "XYZ"
5546
}
5647
}
5748

5849
module "vpc" {
59-
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=master"
60-
namespace = "cp"
61-
name = "jenkins"
62-
stage = "prod"
63-
cidr_block = "10.0.0.0/16"
64-
delimiter = "-"
65-
attributes = ["vpc"]
50+
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=master"
51+
namespace = "cp"
52+
name = "jenkins"
53+
stage = "prod"
54+
cidr_block = "10.0.0.0/16"
55+
assign_generated_ipv6_cidr_block = "true"
6656

6757
tags = {
6858
BusinessUnit = "ABC"
@@ -71,21 +61,16 @@ module "vpc" {
7161
}
7262

7363
module "subnets" {
74-
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=master"
75-
availability_zones = ["${data.aws_availability_zones.available.names}"]
76-
namespace = "cp"
77-
name = "jenkins"
78-
stage = "prod"
79-
region = "us-west-2"
80-
vpc_id = "${module.vpc.vpc_id}"
81-
igw_id = "${module.vpc.igw_id}"
82-
cidr_block = "10.0.0.0/16"
83-
nat_gateway_enabled = "true"
84-
vpc_default_route_table_id = "${module.vpc.vpc_default_route_table_id}"
85-
public_network_acl_id = "${module.vpc.vpc_default_network_acl_id}"
86-
private_network_acl_id = "${module.vpc.vpc_default_network_acl_id}"
87-
delimiter = "-"
88-
attributes = ["subnet"]
64+
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=master"
65+
availability_zones = ["${data.aws_availability_zones.available.names}"]
66+
namespace = "cp"
67+
name = "jenkins"
68+
stage = "prod"
69+
region = "us-west-2"
70+
vpc_id = "${module.vpc.vpc_id}"
71+
igw_id = "${module.vpc.igw_id}"
72+
cidr_block = "${module.vpc.vpc_cidr_block}"
73+
nat_gateway_enabled = "true"
8974

9075
tags = {
9176
BusinessUnit = "ABC"

0 commit comments

Comments
 (0)