Skip to content

Rebase from origin #4193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Rebase from origin #4193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41664f2
add IAM policies for linux GH runners
jlouros Aug 9, 2021
2bb7351
COPS: add policy to access packages S3 bucket
jlouros Jan 12, 2022
0df184f
COPS-6202 Add zip to linux runner (#1)
rayalexander Jan 21, 2022
3543282
COPS-6202 Add packages arn (#2)
rayalexander Jan 21, 2022
1fce6e7
add s3:GetObjectTagging permission to GH runners
jlouros May 12, 2022
8c4d714
COPS-11060 Add s3:PutObjectTagging permission to runner role
rayalexander Jun 29, 2022
e9e97e3
docs: auto update terraform docs
github-actions[bot] May 3, 2023
6a987d2
TA-757 Update bucket permissions on github-ci-loop-artifacts
rayalexander May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/runners/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ yarn run dist
| [aws_iam_role_policy.describe_tags](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.dist_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.ec2](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.gh_artifacts_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.job_retry_sqs_publish](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.runner_ecr_scan_push_access](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.runner_session_manager_aws_managed](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.scale_down](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.scale_down_logging](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
Expand All @@ -103,6 +105,8 @@ yarn run dist
| [aws_iam_role_policy.ssm_parameters](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy_attachment.ami_id_ssm_parameter_read](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.managed_policies](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.runner_basic_ecr_access](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.runner_code_artifact_admin_access](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.scale_down_vpc_execution_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.scale_up_vpc_execution_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.ssm_housekeeper_vpc_execution_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
Expand Down
27 changes: 27 additions & 0 deletions modules/runners/policies-runner.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,30 @@ resource "aws_iam_role_policy" "ec2" {
}

# see also logging.tf for logging and metrics policies

resource "aws_iam_role_policy" "gh_artifacts_bucket" {
name = "github-ci-loop-artifacts-bucket"
role = aws_iam_role.runner.name
policy = templatefile("${path.module}/policies/instance-s3-gh-policy.json",
{
s3_arn = "arn:aws:s3:::github-ci-loop-artifacts"
s3_packages_arn = "arn:aws:s3:::packages.shs-ie-01.intelliflo.services"
}
)
}

resource "aws_iam_role_policy" "runner_ecr_scan_push_access" {
name = "ecr-scan-push-access"
role = aws_iam_role.runner.name
policy = file("${path.module}/policies/instance-ecr-gh-policy.json")
}

resource "aws_iam_role_policy_attachment" "runner_code_artifact_admin_access" {
role = aws_iam_role.runner.name
policy_arn = "arn:aws:iam::aws:policy/AWSCodeArtifactAdminAccess"
}

resource "aws_iam_role_policy_attachment" "runner_basic_ecr_access" {
role = aws_iam_role.runner.name
policy_arn = "arn:aws:iam::aws:policy/service-role/AWSAppRunnerServicePolicyForECRAccess"
}
28 changes: 28 additions & 0 deletions modules/runners/policies/instance-ecr-gh-policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"Version": "2012-10-17",
"Statement": [
{
"Sid": "githubActionEcr",
"Effect": "Allow",
"Action": [
"ecr:DescribeImageScanFindings",
"ecr:StartImageScan",
"ecr:GetDownloadUrlForLayer",
"ecr:DescribeRegistry",
"ecr:GetAuthorizationToken",
"ecr:ListTagsForResource",
"ecr:UploadLayerPart",
"ecr:BatchDeleteImage",
"ecr:ListImages",
"ecr:PutImage",
"ecr:BatchGetImage",
"ecr:CompleteLayerUpload",
"ecr:DescribeImages",
"ecr:DescribeRepositories",
"ecr:InitiateLayerUpload",
"ecr:BatchCheckLayerAvailability"
],
"Resource": "*"
}
]
}
24 changes: 24 additions & 0 deletions modules/runners/policies/instance-s3-gh-policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"Version": "2012-10-17",
"Statement": [
{
"Sid": "githubActionArtifacts",
"Effect": "Allow",
"Action": [
"s3:ListBucket",
"s3:GetObject",
"s3:GetObjectTagging",
"s3:DeleteObject",
"s3:PutObject",
"s3:PutObjectAcl",
"s3:PutObjectTagging"
],
"Resource": [
"${s3_arn}/*",
"${s3_arn}",
"${s3_packages_arn}/*",
"${s3_packages_arn}"
]
}
]
}
2 changes: 1 addition & 1 deletion modules/runners/templates/user-data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ install_with_retry docker
service docker start
usermod -a -G docker ec2-user

install_with_retry amazon-cloudwatch-agent jq git
install_with_retry amazon-cloudwatch-agent jq git zip
install_with_retry --allowerasing curl

user_name=ec2-user
Expand Down
Loading