Skip to content

Commit eb1786e

Browse files
npalmrjaegers
andauthored
chore: rename to new org (#4344)
cc: @rjaegers --------- Co-authored-by: Ron <[email protected]>
1 parent dfbaeed commit eb1786e

File tree

28 files changed

+947
-968
lines changed

28 files changed

+947
-968
lines changed

.ci/terraform-init-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# required to run tflint via pre-commit
55

66
# only run the script if a uniique pid file exits if not creat it or --force flag is passed
7-
pid="/tmp/philips-labs-terraform-aws-github-runner.pid"
7+
pid="/tmp/github-aws-runners-terraform-aws-github-runner.pid"
88
if [ "$1" == "--force" ]; then
9-
rm -f /tmp/philips-labs-terraform-aws-github-runner.pid
9+
rm -f /tmp/github-aws-runners-terraform-aws-github-runner.pid
1010
fi
1111

1212
if [ ! -f $pid ]; then

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- v1
77
workflow_dispatch:
88

9+
910
jobs:
1011
release:
1112
name: Release
@@ -25,8 +26,8 @@ jobs:
2526
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
2627
id: token
2728
with:
28-
app-id: ${{ secrets.FOREST_RELEASER_APP_ID }}
29-
private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
29+
app-id: ${{ secrets.RELEASER_APP_ID }}
30+
private-key: ${{ secrets.RELEASER_APP_PRIVATE_KEY }}
3031
- name: Extract branch name
3132
id: branch
3233
shell: bash

.github/workflows/update-docs.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@ jobs:
2222

2323
# use an app to ensure CI is triggered
2424
- name: Generate TF docs
25-
if: github.repository_owner == 'philips-labs'
25+
if: github.repository_owner == 'github-aws-runners'
2626
uses: terraform-docs/gh-actions@aeae0038ed47a547e0c0fca5c059d3335f48fb25 # v1.3.0
2727
with:
2828
find-dir: .
2929
git-commit-message: "docs: auto update terraform docs"
30-
git-push: ${{ github.ref != 'refs/heads/main' || github.repository_owner != 'philips-labs' }}
31-
git-push-user-name: philips-labs-pr|bot
32-
git-push-user-email: "philips-labs-pr[bot]@users.noreply.github.com"
30+
git-push: ${{ github.ref != 'refs/heads/main' || github.repository_owner != 'github-aws-runners' }}
31+
git-push-user-name: github-aws-runners-pr|bot
32+
git-push-user-email: "github-aws-runners-pr[bot]@users.noreply.github.com"
3333

3434
- name: Generate TF docs (forks)
35-
if: github.repository_owner != 'philips-labs'
35+
if: github.repository_owner != 'github-aws-runners'
3636
uses: terraform-docs/gh-actions@aeae0038ed47a547e0c0fca5c059d3335f48fb25 # v1.3.0
3737
with:
3838
find-dir: .
3939
git-commit-message: "docs: auto update terraform docs"
40-
git-push: ${{ github.ref != 'refs/heads/main' || github.repository_owner != 'philips-labs' }}
40+
git-push: ${{ github.ref != 'refs/heads/main' || github.repository_owner != 'github-aws-runners' }}
4141

4242
# change docs via PR in case of locked main branch
4343
- name: Create Pull Request (main branch only)
44-
if: github.ref == 'refs/heads/main' && github.repository_owner == 'philips-labs'
44+
if: github.ref == 'refs/heads/main' && github.repository_owner == 'github-aws-runners'
4545
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
4646
with:
4747
token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

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

CODEOWNERS

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Each line is a file pattern followed by one or more owners.
2+
3+
# These owners will be the default owners for everything in
4+
# the repo. Unless a later match takes precedence,
5+
* @github-aws-runners/terraform-aws-github-runner
6+
7+
# admins
8+
CODEOWNERS @github-aws-runners/terraform-aws-github-runner-admins
9+
LICENSE* @github-aws-runners/terraform-aws-github-runner-admins
10+
11+
# maintainers - protect potential interface changes by maintainer team
12+
.github/** @github-aws-runners/terraform-aws-github-runner-maintainers
13+
/*.* @github-aws-runners/terraform-aws-github-runner-maintainers
14+
/policies/** @github-aws-runners/terraform-aws-github-runner-maintainers
15+
/modules/multi-runner/** @github-aws-runners/terraform-aws-github-runner-maintainers
16+
17+
# exclude example from CODEOWNER file. NOT USED YET
18+
# CHANGELOG.md

CONTRIBUTING.md

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
# Contributing to Forest Terraform
1+
# Contributing to this project
22

3-
We'd love for you to contribute to our source code and to make the Forest even better than it is today! Here are the guidelines we'd like you to follow:
3+
We'd love for you to contribute to our source code and to make this project even better than it is today! Here are the guidelines we'd like you to follow:
44

55
* [Question or Problem?](#question)
66
* [Issues and Bugs](#issue)
77
* [Feature Requests](#feature)
88
* [Submission Guidelines](#submit)
9-
* [Further Info](#info)
109

1110
## <a name="question"></a> Got a Question or Problem?
1211

13-
If you have questions about how to use the Forest, please direct these to the [Slack group / philips-software][slack].
14-
15-
[![Slack](https://philips-software-slackin.now.sh/badge.svg)](https://philips-software-slackin.now.sh)
12+
If you have questions about how to use aws-github-runners, please direct these to [Discord](https://discord.gg/bxgXW8jJGh)
1613

1714
## <a name="issue"></a> Found an Issue?
1815

@@ -43,7 +40,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue. H
4340

4441
* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
4542
* **Motivation for or Use Case** - explain why this is a bug for you
46-
* **Forest Version(s)** - is it a regression?
43+
* **Project Version(s)** - is it a regression?
4744
* **Reproduce the Error** - try to describe how to reproduce the error
4845
* **Related Issues** - has a similar issue been reported before?
4946
* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
@@ -146,14 +143,6 @@ from the main (upstream) repository:
146143
git pull --ff upstream main
147144
```
148145
149-
## <a name="info"></a> Info
150-
151-
For more info, please reach out to the team on [Slack group / philips-software][slack] in the #forest channel.
152-
153-
Use the badge to sign-up.
154-
155-
[![Slack](https://philips-software-slackin.now.sh/badge.svg)](https://philips-software-slackin.now.sh)
156146
157147
[contribute]: CONTRIBUTING.md
158-
[github]: https://github.com/philips-labs/terraform-aws-github-runner/issues
159-
[slack]: https://join.slack.com/t/philips-software/shared_invite/zt-xecw65v5-i1531hGP~mdVwgxLFx7ckg
148+
[github]: https://github.com/github-aws-runners/terraform-aws-github-runner/issues

LICENSE.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
The MIT License (MIT) Copyright © 2020 Koninklijke Philips N.V, https://www.philips.com
1+
MIT License
22

3-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
3+
Copyright (c) 2025 GitHub Terraform AWS runners
44

5-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
611

7-
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

MAINTAINERS.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
Navdeep Gupta <[email protected]>
21
Niek Palm <[email protected]>
3-
Scott Guymer <[email protected]>

README.md

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Terraform module Self-Hosted Scalable GitHub Actions runners on AWS.
22

3-
[![docs](https://img.shields.io/badge/docs-runners-blue.svg)](https://philips-labs.github.io/terraform-aws-github-runner) [![awesome-runners](https://img.shields.io/badge/listed%20on-awesome--runners-blue.svg)](https://github.com/jonico/awesome-runners) [![Terraform registry](https://img.shields.io/github/v/release/philips-labs/terraform-aws-github-runner?label=Terraform%20Registry)](https://registry.terraform.io/modules/philips-labs/github-runner/aws/) [![Terraform checks](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/terraform.yml/badge.svg)](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/terraform.yml) [![Lambdas](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/lambda.yml/badge.svg)](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/lambda.yml)
3+
[![docs](https://img.shields.io/badge/docs-runners-blue.svg)](https://github-aws-runners.github.io/terraform-aws-github-runner) [![awesome-runners](https://img.shields.io/badge/listed%20on-awesome--runners-blue.svg)](https://github.com/jonico/awesome-runners) [![Terraform registry](https://img.shields.io/github/v/release/github-aws-runners/terraform-aws-github-runner?label=Terraform%20Registry)](https://registry.terraform.io/modules/github-aws-runners/github-runner/aws/) [![Terraform checks](https://github.com/github-aws-runners/terraform-aws-github-runner/actions/workflows/terraform.yml/badge.svg)](https://github.com/github-aws-runners/terraform-aws-github-runner/actions/workflows/terraform.yml) [![Lambdas](https://github.com/github-aws-runners/terraform-aws-github-runner/actions/workflows/lambda.yml/badge.svg)](https://github.com/github-aws-runners/terraform-aws-github-runner/actions/workflows/lambda.yml)
44

55
> 📢 We're moving `terraform-aws-github-runner` to a new organization https://github.com/github-aws-runners in January to foster growth and community ownership! 🎉 Join us on our new [Discord server](https://discord.gg/EwUScJy8) for discussions and updates. Please see #4298 for more details.
66
7-
> 📄 Extensive documentation is available via our [GitHub Pages Docs site](https://philips-labs.github.io/terraform-aws-github-runner/).
7+
> 📄 Extensive documentation is available via our [GitHub Pages Docs site](https://github-aws-runners.github.io/terraform-aws-github-runner/).
88
99
> 📢 We maintain the project as a truly open-source project. We maintain the project on a best effort basis. We welcome contributions from the community. Feel free to help us answering issues, reviewing PRs, or maintaining and improving the project.
1010
@@ -31,7 +31,7 @@ This [Terraform](https://www.terraform.io/) module creates the required infrastr
3131

3232
## Getting started
3333

34-
Check out the detailed instructions in the [Getting Started](https://philips-labs.github.io/terraform-aws-github-runner/getting-started/) section of the docs. On a high level, the following steps are required to get started:
34+
Check out the detailed instructions in the [Getting Started](https://github-aws-runners.github.io/terraform-aws-github-runner/getting-started/) section of the docs. On a high level, the following steps are required to get started:
3535
- Setup your AWS account
3636
- Create and configure a GitHub App
3737
- Download or build the required lambdas
@@ -42,7 +42,11 @@ Check out the provided Terraform examples in the [examples](./examples) director
4242

4343
## Configuration
4444

45-
Please check the [configuration](https://philips-labs.github.io/terraform-aws-github-runner/configuration/) section of the docs for major configuration options. See the Terraform module documentation for all available options.
45+
Please check the [configuration](https://github-aws-runners.github.io/terraform-aws-github-runner/configuration/) section of the docs for major configuration options. See the Terraform module documentation for all available options.
46+
47+
## Acknowledgements
48+
49+
This repository was originally founded and maintained by Philips Labs. We gratefully acknowledge their initial contributions and stewardship of this project. You can find the original repository here: [https://github.com/philips-labs/terraform-aws-github-runner](https://github.com/philips-labs/terraform-aws-github-runner)
4650

4751
## License
4852

@@ -52,24 +56,9 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE.md) f
5256

5357
We welcome contributions, please check out the [contribution guide](CONTRIBUTING.md). Be aware we use [pre commit hooks](https://pre-commit.com/) to update the docs.
5458

55-
## Philips Forest
56-
57-
This module is part of the Philips Forest.
58-
59-
```plain
60-
___ _
61-
/ __\__ _ __ ___ ___| |_
62-
/ _\/ _ \| '__/ _ \/ __| __|
63-
/ / | (_) | | | __/\__ \ |_
64-
\/ \___/|_| \___||___/\__|
65-
66-
Infrastructure
67-
```
68-
69-
Talk to the forestkeepers in the `runners-channel` on Slack.
70-
71-
[![Slack](https://img.shields.io/badge/Slack-4A154B?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/philips-software/shared_invite/zt-xecw65v5-i1531hGP~mdVwgxLFx7ckg)
59+
## Join the community
7260

61+
Join our discord community via [this invite link](https://discord.gg/bxgXW8jJGh))
7362

7463
<details>
7564
<summary>Terraform root module documention</summary>
@@ -227,7 +216,7 @@ Talk to the forestkeepers in the `runners-channel` on Slack.
227216
| <a name="input_scale_up_reserved_concurrent_executions"></a> [scale\_up\_reserved\_concurrent\_executions](#input\_scale\_up\_reserved\_concurrent\_executions) | Amount of reserved concurrent executions for the scale-up lambda function. A value of 0 disables lambda from being triggered and -1 removes any concurrency limitations. | `number` | `1` | no |
228217
| <a name="input_ssm_paths"></a> [ssm\_paths](#input\_ssm\_paths) | The root path used in SSM to store configuration and secrets. | <pre>object({<br/> root = optional(string, "github-action-runners")<br/> app = optional(string, "app")<br/> runners = optional(string, "runners")<br/> webhook = optional(string, "webhook")<br/> use_prefix = optional(bool, true)<br/> })</pre> | `{}` | no |
229218
| <a name="input_state_event_rule_binaries_syncer"></a> [state\_event\_rule\_binaries\_syncer](#input\_state\_event\_rule\_binaries\_syncer) | Option to disable EventBridge Lambda trigger for the binary syncer, useful to stop automatic updates of binary distribution | `string` | `"ENABLED"` | no |
230-
| <a name="input_subnet_ids"></a> [subnet\_ids](#input\_subnet\_ids) | List of subnets in which the action runner instances will be launched. The subnets need to exist in the configured VPC (`vpc_id`), and must reside in different availability zones (see https://github.com/philips-labs/terraform-aws-github-runner/issues/2904) | `list(string)` | n/a | yes |
219+
| <a name="input_subnet_ids"></a> [subnet\_ids](#input\_subnet\_ids) | List of subnets in which the action runner instances will be launched. The subnets need to exist in the configured VPC (`vpc_id`), and must reside in different availability zones (see https://github.com/github-aws-runners/terraform-aws-github-runner/issues/2904) | `list(string)` | n/a | yes |
231220
| <a name="input_syncer_lambda_s3_key"></a> [syncer\_lambda\_s3\_key](#input\_syncer\_lambda\_s3\_key) | S3 key for syncer lambda function. Required if using an S3 bucket to specify lambdas. | `string` | `null` | no |
232221
| <a name="input_syncer_lambda_s3_object_version"></a> [syncer\_lambda\_s3\_object\_version](#input\_syncer\_lambda\_s3\_object\_version) | S3 object version for syncer lambda function. Useful if S3 versioning is enabled on source bucket. | `string` | `null` | no |
233222
| <a name="input_tags"></a> [tags](#input\_tags) | Map of tags that will be added to created resources. By default resources will be tagged with name and environment. | `map(string)` | `{}` | no |

docs/configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To be able to support a number of use-cases, the module has quite a lot of confi
1010
- Linux vs Windows. You can configure the OS types linux and win. Linux will be used by default.
1111
- Re-use vs Ephemeral. By default runners are re-used, until detected idle. Once idle they will be removed from the pool. To improve security we are introducing ephemeral runners. Those runners are only used for one job. Ephemeral runners only work in combination with the workflow job event. For ephemeral runners the lambda requests a JIT (just in time) configuration via the GitHub API to register the runner. [JIT configuration](https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-just-in-time-runners) is limited to ephemeral runners (and currently not supported by GHES). For non-ephemeral runners, a registration token is always requested. In both cases the configuration is made available to the instance via the same SSM parameter. To disable JIT configuration for ephemeral runners set `enable_jit_config` to `false`. We also suggest using a pre-build AMI to improve the start time of jobs for ephemeral runners.
1212
- Job retry (**Beta**). By default the scale-up lambda will discard the message when it is handled. Meaning in the ephemeral use-case an instance is created. The created runner will ask GitHub for a job, no guarantee it will run the job for which it was scaling. Result could be that with small system hick-up the job is keeping waiting for a runner. Enable a pool (org runners) is one option to avoid this problem. Another option is to enable the job retry function. Which will retry the job after a delay for a configured number of times.
13-
- GitHub Cloud vs GitHub Enterprise Server (GHES). The runners support GitHub Cloud as well GitHub Enterprise Server. For GHES, we rely on our community for support and testing. We at Philips have no capability to test GHES ourselves.
13+
- GitHub Cloud vs GitHub Enterprise Server (GHES). The runners support GitHub Cloud as well GitHub Enterprise Server. For GHES, we rely on our community for support and testing. We have no capability to test GHES ourselves.
1414
- Spot vs on-demand. The runners use either the EC2 spot or on-demand life cycle. Runners will be created via the AWS [CreateFleet API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet.html). The module (scale up lambda) will request via the CreateFleet API to create instances in one of the subnets and of the specified instance types.
1515
- ARM64 support via Graviton/Graviton2 instance-types. When using the default example or top-level module, specifying `instance_types` that match a Graviton/Graviton 2 (ARM64) architecture (e.g. a1, t4g or any 6th-gen `g` or `gd` type), you must also specify `runner_architecture = "arm64"` and the sub-modules will be automatically configured to provision with ARM64 AMIs and leverage GitHub's ARM64 action runner. See below for more details.
1616
- Disable default labels for the runners (os, architecture and `self-hosted`) can achieve by setting `runner_disable_default_labels` = true. If enabled, the runner will only have the extra labels provided in `runner_extra_labels`. In case you on own start script is used, this configuration parameter needs to be parsed via SSM.
@@ -270,7 +270,7 @@ Example to extend the EventBridge:
270270
```hcl
271271
272272
module "runners" {
273-
source = "philips-labs/github-runners/aws"
273+
source = "github-aws-runners/github-runners/aws"
274274
275275
...
276276
eventbridge = {

0 commit comments

Comments
 (0)