Skip to content

Commit

Permalink
Add container dependencies to the ECS canaries (#359)
Browse files Browse the repository at this point in the history
*Issue description:*
ECS canaries failed intermittently due to incorrect container start
sequence.

*Description of changes:*
Add container dependencies to the default app container to wait until
init container to complete and cwa container to start.

*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.
  • Loading branch information
bjrara authored Jan 17, 2025
1 parent 4c275d3 commit ad0ccd1
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 4 deletions.
18 changes: 14 additions & 4 deletions terraform/java/ecs/resources/main-service.json.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"name": "OTEL_PROPAGATORS",
"value": "tracecontext,baggage,b3,xray"
},
{
"name": "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED",
"value": "true"
}
{
"name": "OTEL_INSTRUMENTATION_COMMON_EXPERIMENTAL_CONTROLLER_TELEMETRY_ENABLED",
"value": "true"
}
],
"mountPoints": [
{
Expand All @@ -66,6 +66,16 @@
"readOnly": false
}
],
"dependsOn": [
{
"containerName": "init",
"condition": "SUCCESS"
},
{
"containerName": "ecs-cwagent",
"condition": "START"
}
],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
Expand Down
10 changes: 10 additions & 0 deletions terraform/python/ecs/resources/main-service.json.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"readOnly": false
}
],
"dependsOn": [
{
"containerName": "init",
"condition": "SUCCESS"
},
{
"containerName": "ecs-cwagent",
"condition": "START"
}
],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
Expand Down

0 comments on commit ad0ccd1

Please sign in to comment.