Skip to content

Commit 1d1c783

Browse files
authored
Increase EC2 volume (#315)
*Issue description:* Fix disk shortage in EC2 canaries. *Description of changes:* *Rollback procedure:* <Can we safely revert this commit if needed? If not, detail what must be done to safely revert and why it is needed.> *Ensure you've run the following tests on your changes and include the link below:* To do so, create a `test.yml` file with `name: Test` and workflow description to test your changes, then remove the file for your PR. Link your test run in your PR description. This process is a short term solution while we work on creating a staging environment for testing. NOTE: TESTS RUNNING ON A SINGLE EKS CLUSTER CANNOT BE RUN IN PARALLEL. See the [needs](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idneeds) keyword to run tests in succession. - Run Java EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run Python EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run metric limiter on EKS cluster `e2e-playground` in us-east-1 and eu-central-2 - Run EC2 tests in all regions - Run K8s on a separate K8s cluster (check IAD test account for master node endpoints; these will change as we create and destroy clusters for OS patching) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 9bd56c0 commit 1d1c783

File tree

10 files changed

+96
-0
lines changed

10 files changed

+96
-0
lines changed

terraform/dotnet/ec2/asg/main.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ resource "aws_launch_configuration" "launch_configuration" {
9191
associate_public_ip_address = true
9292
iam_instance_profile = "APP_SIGNALS_EC2_TEST_ROLE"
9393
security_groups = [aws_default_vpc.default.default_security_group_id]
94+
95+
root_block_device {
96+
volume_size = 5
97+
}
9498

9599
user_data = <<-EOF
96100
#!/bin/bash
@@ -185,10 +189,15 @@ resource "aws_instance" "remote_service_instance" {
185189
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
186190
associate_public_ip_address = true
187191
instance_initiated_shutdown_behavior = "terminate"
192+
188193
metadata_options {
189194
http_tokens = "required"
190195
}
191196

197+
root_block_device {
198+
volume_size = 5
199+
}
200+
192201
tags = {
193202
Name = "remote-service-${var.test_id}"
194203
}

terraform/dotnet/ec2/default/main.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,15 @@ resource "aws_instance" "main_service_instance" {
8585
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
8686
associate_public_ip_address = true
8787
instance_initiated_shutdown_behavior = "terminate"
88+
8889
metadata_options {
8990
http_tokens = "required"
9091
}
9192

93+
root_block_device {
94+
volume_size = 5
95+
}
96+
9297
tags = {
9398
Name = "main-service-${var.test_id}"
9499
}
@@ -188,10 +193,15 @@ resource "aws_instance" "remote_service_instance" {
188193
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
189194
associate_public_ip_address = true
190195
instance_initiated_shutdown_behavior = "terminate"
196+
191197
metadata_options {
192198
http_tokens = "required"
193199
}
194200

201+
root_block_device {
202+
volume_size = 5
203+
}
204+
195205
tags = {
196206
Name = "remote-service-${var.test_id}"
197207
}

terraform/dotnet/ec2/nuget/main.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,15 @@ resource "aws_instance" "main_service_instance" {
8585
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
8686
associate_public_ip_address = true
8787
instance_initiated_shutdown_behavior = "terminate"
88+
8889
metadata_options {
8990
http_tokens = "required"
9091
}
9192

93+
root_block_device {
94+
volume_size = 5
95+
}
96+
9297
tags = {
9398
Name = "main-service-${var.test_id}"
9499
}
@@ -174,10 +179,15 @@ resource "aws_instance" "remote_service_instance" {
174179
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
175180
associate_public_ip_address = true
176181
instance_initiated_shutdown_behavior = "terminate"
182+
177183
metadata_options {
178184
http_tokens = "required"
179185
}
180186

187+
root_block_device {
188+
volume_size = 5
189+
}
190+
181191
tags = {
182192
Name = "remote-service-${var.test_id}"
183193
}

terraform/dotnet/ec2/windows/main.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,16 @@ resource "aws_instance" "main_service_instance" {
6969
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
7070
associate_public_ip_address = true
7171
instance_initiated_shutdown_behavior = "terminate"
72+
7273
metadata_options {
7374
http_tokens = "required"
7475
}
7576
get_password_data = true
7677

78+
root_block_device {
79+
volume_size = 5
80+
}
81+
7782
tags = {
7883
Name = "main-service-${var.test_id}"
7984
}
@@ -111,11 +116,16 @@ resource "aws_instance" "remote_service_instance" {
111116
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
112117
associate_public_ip_address = true
113118
instance_initiated_shutdown_behavior = "terminate"
119+
114120
metadata_options {
115121
http_tokens = "required"
116122
}
117123
get_password_data = true
118124

125+
root_block_device {
126+
volume_size = 5
127+
}
128+
119129
tags = {
120130
Name = "remote-service-${var.test_id}"
121131
}

terraform/java/ec2/asg/main.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ resource "aws_launch_configuration" "launch_configuration" {
9292
iam_instance_profile = "APP_SIGNALS_EC2_TEST_ROLE"
9393
security_groups = [aws_default_vpc.default.default_security_group_id]
9494

95+
root_block_device {
96+
volume_size = 5
97+
}
98+
9599
user_data = <<-EOF
96100
#!/bin/bash
97101
# Make the Terraform fail if any step throws an error
@@ -171,10 +175,15 @@ resource "aws_instance" "remote_service_instance" {
171175
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
172176
associate_public_ip_address = true
173177
instance_initiated_shutdown_behavior = "terminate"
178+
174179
metadata_options {
175180
http_tokens = "required"
176181
}
177182

183+
root_block_device {
184+
volume_size = 5
185+
}
186+
178187
tags = {
179188
Name = "remote-service-${var.test_id}"
180189
}

terraform/java/ec2/default/main.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,15 @@ resource "aws_instance" "main_service_instance" {
8585
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
8686
associate_public_ip_address = true
8787
instance_initiated_shutdown_behavior = "terminate"
88+
8889
metadata_options {
8990
http_tokens = "required"
9091
}
9192

93+
root_block_device {
94+
volume_size = 5
95+
}
96+
9297
tags = {
9398
Name = "main-service-${var.test_id}"
9499
}
@@ -176,10 +181,15 @@ resource "aws_instance" "remote_service_instance" {
176181
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
177182
associate_public_ip_address = true
178183
instance_initiated_shutdown_behavior = "terminate"
184+
179185
metadata_options {
180186
http_tokens = "required"
181187
}
182188

189+
root_block_device {
190+
volume_size = 5
191+
}
192+
183193
tags = {
184194
Name = "remote-service-${var.test_id}"
185195
}

terraform/node/ec2/asg/main.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ resource "aws_launch_configuration" "launch_configuration" {
9292
iam_instance_profile = "APP_SIGNALS_EC2_TEST_ROLE"
9393
security_groups = [aws_default_vpc.default.default_security_group_id]
9494

95+
root_block_device {
96+
volume_size = 5
97+
}
98+
9599
user_data = <<-EOF
96100
#!/bin/bash
97101
@@ -193,10 +197,15 @@ resource "aws_instance" "remote_service_instance" {
193197
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
194198
associate_public_ip_address = true
195199
instance_initiated_shutdown_behavior = "terminate"
200+
196201
metadata_options {
197202
http_tokens = "required"
198203
}
199204

205+
root_block_device {
206+
volume_size = 5
207+
}
208+
200209
tags = {
201210
Name = "remote-service-${var.test_id}"
202211
}

terraform/node/ec2/default/main.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,15 @@ resource "aws_instance" "main_service_instance" {
8585
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
8686
associate_public_ip_address = true
8787
instance_initiated_shutdown_behavior = "terminate"
88+
8889
metadata_options {
8990
http_tokens = "required"
9091
}
9192

93+
root_block_device {
94+
volume_size = 5
95+
}
96+
9297
tags = {
9398
Name = "main-service-${var.test_id}"
9499
}
@@ -197,10 +202,15 @@ resource "aws_instance" "remote_service_instance" {
197202
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
198203
associate_public_ip_address = true
199204
instance_initiated_shutdown_behavior = "terminate"
205+
200206
metadata_options {
201207
http_tokens = "required"
202208
}
203209

210+
root_block_device {
211+
volume_size = 5
212+
}
213+
204214
tags = {
205215
Name = "remote-service-${var.test_id}"
206216
}

terraform/python/ec2/asg/main.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ resource "aws_launch_configuration" "launch_configuration" {
9292
iam_instance_profile = "APP_SIGNALS_EC2_TEST_ROLE"
9393
security_groups = [aws_default_vpc.default.default_security_group_id]
9494

95+
root_block_device {
96+
volume_size = 5
97+
}
98+
9599
user_data = <<-EOF
96100
#!/bin/bash
97101
@@ -206,10 +210,15 @@ resource "aws_instance" "remote_service_instance" {
206210
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
207211
associate_public_ip_address = true
208212
instance_initiated_shutdown_behavior = "terminate"
213+
209214
metadata_options {
210215
http_tokens = "required"
211216
}
212217

218+
root_block_device {
219+
volume_size = 5
220+
}
221+
213222
tags = {
214223
Name = "remote-service-${var.test_id}"
215224
}

terraform/python/ec2/default/main.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,15 @@ resource "aws_instance" "main_service_instance" {
8585
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
8686
associate_public_ip_address = true
8787
instance_initiated_shutdown_behavior = "terminate"
88+
8889
metadata_options {
8990
http_tokens = "required"
9091
}
9192

93+
root_block_device {
94+
volume_size = 5
95+
}
96+
9297
tags = {
9398
Name = "main-service-${var.test_id}"
9499
}
@@ -208,10 +213,15 @@ resource "aws_instance" "remote_service_instance" {
208213
vpc_security_group_ids = [aws_default_vpc.default.default_security_group_id]
209214
associate_public_ip_address = true
210215
instance_initiated_shutdown_behavior = "terminate"
216+
211217
metadata_options {
212218
http_tokens = "required"
213219
}
214220

221+
root_block_device {
222+
volume_size = 5
223+
}
224+
215225
tags = {
216226
Name = "remote-service-${var.test_id}"
217227
}

0 commit comments

Comments
 (0)