Skip to content

Commit

Permalink
updating
Browse files Browse the repository at this point in the history
  • Loading branch information
arnol377 committed Oct 17, 2024
1 parent 6b90563 commit 3f4f8e8
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 27 deletions.
23 changes: 23 additions & 0 deletions default.auto.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# The name of the ECS cluster
image_name = "github-runner"
image_version = "1.61.0"
server_url = "https://github.e.it.census.gov"
create_vpc_endpoint = true
create_ecs_cluster = true

ecs_cluster_name = "ecs-ghe-runners"
vpc_id = "vpc-00576a396ec570b94"

subnets = [
"subnet-04b80d7ce5199f82b"
]

security_groups = [
# "sg-0d828d223df9834a6"
"sg-0641c697588b9aa6b"
]

certs = {
bucket = "image-pipeline-assets"
key = "katello-server-ca.pem"
}
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ module "github-runner" {
# for_each = toset([for repo in local.all_repos : repo])
source = "HappyPathway/github-runner/ecs"
ecs_cluster = local.ecs_cluster
hostname = "CSVD"
hostname = var.repo_org
image = "229685449397.dkr.ecr.us-gov-west-1.amazonaws.com/github-runners/${var.image_name}:${var.image_version}"
repo_org = var.repo_org
# repo_name = each.value
namespace = "csvd-${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}"
namespace = "${lower(var.repo_org)}-${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}"
log_group = aws_cloudwatch_log_group.function_log_group.name
runner_group = {
create = true
Expand All @@ -114,7 +114,7 @@ module "github-runner" {

server_url = var.server_url
runner_labels = [
"csvd",
var.repo_org,
"${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}",
data.aws_caller_identity.current.account_id,
data.aws_region.current.name,
Expand Down
24 changes: 0 additions & 24 deletions varfiles/automation-repos.tfvars
Original file line number Diff line number Diff line change
@@ -1,26 +1,2 @@
# The name of the ECS cluster
image_name = "github-runner"
image_version = "1.61.0"
server_url = "https://github.e.it.census.gov"
create_vpc_endpoint = true
create_ecs_cluster = true

ecs_cluster_name = "ecs-ghe-runners"
vpc_id = "vpc-00576a396ec570b94"

namespace = "csvd-ghe-runner"
repo_org = "CSVD"

subnets = [
"subnet-04b80d7ce5199f82b"
]

security_groups = [
# "sg-0d828d223df9834a6"
"sg-0641c697588b9aa6b"
]

certs = {
bucket = "image-pipeline-assets"
key = "katello-server-ca.pem"
}
3 changes: 3 additions & 0 deletions varfiles/edtsb.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The name of the ECS cluster
namespace = "edtsb-ghe-runner"
repo_org = "EDTSB"

0 comments on commit 3f4f8e8

Please sign in to comment.