Skip to content

Commit 6c06f0c

Browse files
committed
chore: rename to new org
1 parent 19d03b3 commit 6c06f0c

File tree

24 files changed

+901
-955
lines changed

24 files changed

+901
-955
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/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.

CONTRIBUTING.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ We'd love for you to contribute to our source code and to make the Forest even b
1010

1111
## <a name="question"></a> Got a Question or Problem?
1212

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)
13+
If you have questions about how to use the Forest, please direct these to [Discord](https://discord.gg/bxgXW8jJGh)
1614

1715
## <a name="issue"></a> Found an Issue?
1816

@@ -148,12 +146,5 @@ from the main (upstream) repository:
148146
149147
## <a name="info"></a> Info
150148
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)
156-
157149
[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
150+
[github]: https://github.com/github-aws-runners/terraform-aws-github-runner/issues

README.md

Lines changed: 7 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,7 @@ 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.
4646

4747
## License
4848

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

5353
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.
5454

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)
55+
## Join the community
7256

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

7459
<details>
7560
<summary>Terraform root module documention</summary>
@@ -227,7 +212,7 @@ Talk to the forestkeepers in the `runners-channel` on Slack.
227212
| <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 |
228213
| <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 |
229214
| <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 |
215+
| <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 |
231216
| <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 |
232217
| <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 |
233218
| <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 = {

docs/examples/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Examples
22

3-
Examples are located in the [examples](https://github.com/philips-labs/terraform-aws-github-runner/tree/main/examples) directory. The following examples are provided:
3+
Examples are located in the [examples](https://github.com/github-aws-runners/terraform-aws-github-runner/tree/main/examples) directory. The following examples are provided:
44

55
- _[Default](default.md)_: The default example of the module
66
- _[Ephemeral](ephemeral.md)_: Example usages of ephemeral runners based on the default example.

docs/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To apply the terraform module, the compiled lambdas (.zip files) need to be avai
5151

5252
To read the files from S3, set the `lambda_s3_bucket` variable and the specific object key for each lambda.
5353

54-
The lambdas can be downloaded manually from the [release page](https://github.com/philips-labs/terraform-aws-github-runner/releases) or using the [download-lambda](modules/public/download-lambda.md) terraform module (requires `curl` to be installed on your machine). In the `download-lambda` directory, run `terraform init && terraform apply`. The lambdas will be saved to the same directory.
54+
The lambdas can be downloaded manually from the [release page](https://github.com/github-aws-runners/terraform-aws-github-runner/releases) or using the [download-lambda](modules/public/download-lambda.md) terraform module (requires `curl` to be installed on your machine). In the `download-lambda` directory, run `terraform init && terraform apply`. The lambdas will be saved to the same directory.
5555

5656
For local development you can build all the lambdas at once using `.ci/build.sh` or individually using `yarn dist`.
5757

@@ -73,7 +73,7 @@ Note that `github_app.key_base64` needs to be a base64-encoded string of the `.p
7373

7474
```hcl
7575
module "github-runner" {
76-
source = "philips-labs/github-runner/aws"
76+
source = "github-aws-runners/github-runner/aws"
7777
version = "REPLACE_WITH_VERSION"
7878
7979
aws_region = "eu-west-1"

examples/default/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ This module shows how to create GitHub action runners. Lambda release will be do
44

55
## Usages
66

7-
Steps for the full setup, such as creating a GitHub app can be found in the root module's [README](https://github.com/philips-labs/terraform-aws-github-runner). First download the Lambda releases from GitHub. Alternatively you can build the lambdas locally with Node or Docker, there is a simple build script in `<root>/.ci/build.sh`. In the `main.tf` you can simply remove the location of the lambda zip files, the default location will work in this case.
7+
Steps for the full setup, such as creating a GitHub app can be found in the root module's [README](https://github.com/github-aws-runners/terraform-aws-github-runner). First download the Lambda releases from GitHub. Alternatively you can build the lambdas locally with Node or Docker, there is a simple build script in `<root>/.ci/build.sh`. In the `main.tf` you can simply remove the location of the lambda zip files, the default location will work in this case.
88

9-
> The default example assumes local built lambda's available. Ensure you have built the lambda's. Alternativly you can downlowd the lambda's. The version needs to be set to a GitHub release version, see https://github.com/philips-labs/terraform-aws-github-runner/releases
9+
> The default example assumes local built lambda's available. Ensure you have built the lambda's. Alternativly you can downlowd the lambda's. The version needs to be set to a GitHub release version, see https://github.com/github-aws-runners/terraform-aws-github-runner/releases
1010
1111
```bash
1212
cd ../lambdas-download
@@ -15,7 +15,7 @@ terraform apply -var=module_version=<VERSION>
1515
cd -
1616
```
1717

18-
Before running Terraform, ensure the GitHub app is configured. See the [configuration details](https://github.com/philips-labs/terraform-aws-github-runner#usages) for more details.
18+
Before running Terraform, ensure the GitHub app is configured. See the [configuration details](https://github.com/github-aws-runners/terraform-aws-github-runner#usages) for more details.
1919

2020
```bash
2121
terraform init

0 commit comments

Comments
 (0)