Skip to content

Commit 64ec531

Browse files
npalmnpalm
committed
Merge branch 'release/v0.8.0' into master
2 parents 02c8f84 + 6e42558 commit 64ec531

File tree

25 files changed

+500
-520
lines changed

25 files changed

+500
-520
lines changed

‎.github/workflows/terraform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- "modules/*/lambdas/**"
1010

1111
env:
12-
tf_version: "0.12.24"
12+
tf_version: "0.13.5"
1313
tf_working_dir: "."
1414
AWS_REGION: eu-west-1
1515
jobs:

‎CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.8.0] - 2020-12-08
11+
12+
### Changed
13+
- Examples upgraded to Terraform 13 (#372)
14+
### Added
15+
- Streaming runner logs to cloudwatch #375
1016

1117
## [0.7.0] - 2020-12-04
1218
### Changed
@@ -90,7 +96,8 @@ terraform import module.runners.module.webhook.aws_cloudwatch_log_group.webhook
9096

9197
- First release.
9298

93-
[unreleased]: https://github.com/philips-labs/terraform-aws-github-runner/compare/v0.7.0..HEAD
99+
[unreleased]: https://github.com/philips-labs/terraform-aws-github-runner/compare/v0.8.0..HEAD
100+
[0.8.0]: https://github.com/philips-labs/terraform-aws-github-runner/releases/tag/v0.7.0..v0.8.0
94101
[0.7.0]: https://github.com/philips-labs/terraform-aws-github-runner/releases/tag/v0.6.0..v0.7.0
95102
[0.6.0]: https://github.com/philips-labs/terraform-aws-github-runner/releases/tag/v0.5.0..v0.6.0
96103
[0.5.0]: https://github.com/philips-labs/terraform-aws-github-runner/releases/tag/v0.4.0..v0.5.0

‎README.md

Lines changed: 53 additions & 48 deletions
Large diffs are not rendered by default.

‎examples/.terraform-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.29
1+
0.13.5

‎examples/default/lambdas-download/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ module "lambdas" {
33
lambdas = [
44
{
55
name = "webhook"
6-
tag = "v0.7.0"
6+
tag = "v0.8.0"
77
},
88
{
99
name = "runners"
10-
tag = "v0.7.0"
10+
tag = "v0.8.0"
1111
},
1212
{
1313
name = "runner-binaries-syncer"
14-
tag = "v0.7.0"
14+
tag = "v0.8.0"
1515
}
1616
]
1717
}

‎examples/default/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ module "runners" {
2727
webhook_secret = random_password.random.result
2828
}
2929

30-
# webhook_lambda_zip = "lambdas-download/webhook.zip"
31-
# runner_binaries_syncer_lambda_zip = "lambdas-download/runner-binaries-syncer.zip"
32-
# runners_lambda_zip = "lambdas-download/runners.zip"
33-
enable_organization_runners = false
34-
runner_extra_labels = "default,example"
30+
webhook_lambda_zip = "lambdas-download/webhook.zip"
31+
runner_binaries_syncer_lambda_zip = "lambdas-download/runner-binaries-syncer.zip"
32+
runners_lambda_zip = "lambdas-download/runners.zip"
33+
enable_organization_runners = false
34+
runner_extra_labels = "default,example"
3535

3636
# enable access to the runners via SSM
3737
enable_ssm_on_runners = true

‎examples/default/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
provider "aws" {
22
region = local.aws_region
3-
version = "3.0"
3+
version = "3.20"
44
}

‎examples/permissions-boundary/lambdas-download/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ module "lambdas" {
33
lambdas = [
44
{
55
name = "webhook"
6-
tag = "v0.7.0"
6+
tag = "v0.8.0"
77
},
88
{
99
name = "runners"
10-
tag = "v0.7.0"
10+
tag = "v0.8.0"
1111
},
1212
{
1313
name = "runner-binaries-syncer"
14-
tag = "v0.7.0"
14+
tag = "v0.8.0"
1515
}
1616
]
1717
}

‎examples/permissions-boundary/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
provider "aws" {
22
alias = "terraform_role"
33
region = local.aws_region
4-
version = "3.0"
4+
version = "3.20"
55
assume_role {
66
role_arn = data.terraform_remote_state.iam.outputs.role
77
}

‎examples/ubuntu/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
provider "aws" {
22
region = local.aws_region
3-
version = "3.0"
3+
version = "3.20"
44
}

‎main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ module "runners" {
9292
lambda_timeout_scale_up = var.runners_scale_up_lambda_timeout
9393
lambda_timeout_scale_down = var.runners_scale_down_lambda_timeout
9494
logging_retention_in_days = var.logging_retention_in_days
95+
enable_cloudwatch_agent = var.enable_cloudwatch_agent
96+
cloudwatch_config = var.cloudwatch_config
97+
runner_log_files = var.runner_log_files
9598

9699
instance_profile_path = var.instance_profile_path
97100
role_path = var.role_path

‎modules/download-lambda/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ module "lambdas" {
1010
lambdas = [
1111
{
1212
name = "webhook"
13-
tag = "v0.7.0"
13+
tag = "v0.8.0"
1414
},
1515
{
1616
name = "runners"
17-
tag = "v0.7.0"
17+
tag = "v0.8.0"
1818
},
1919
{
2020
name = "runner-binaries-syncer"
21-
tag = "v0.7.0"
21+
tag = "v0.8.0"
2222
}
2323
]
2424
}

‎modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"dist": "yarn build && cd dist && zip ../runner-binaries-syncer.zip index.js"
1414
},
1515
"devDependencies": {
16-
"@octokit/rest": "^18.0.9",
17-
"@types/jest": "^26.0.15",
16+
"@octokit/rest": "^18.0.12",
17+
"@types/jest": "^26.0.16",
1818
"@types/node": "^14.14.10",
1919
"@types/request": "^2.48.4",
2020
"@typescript-eslint/eslint-plugin": "^4.0.0",
2121
"@typescript-eslint/parser": "^3.10.1",
2222
"@zeit/ncc": "^0.22.1",
23-
"aws-sdk": "^2.797.0",
24-
"eslint": "^7.14.0",
23+
"aws-sdk": "^2.804.0",
24+
"eslint": "^7.15.0",
2525
"jest": "^26.6.3",
2626
"ts-jest": "^26.4.4",
2727
"ts-node-dev": "^1.0.0",

0 commit comments

Comments
 (0)