Skip to content

Commit

Permalink
removing worker subnets piece
Browse files Browse the repository at this point in the history
Signed-off-by: greg pereira <[email protected]>
  • Loading branch information
Gregory-Pereira committed Jul 2, 2024
1 parent df0aa66 commit 228c184
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
terraform: [ 1.6.1 ]
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
container:
image: hashicorp/terraform:${{ matrix.terraform }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre_commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy

jobs:
pre_commit:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
steps:
- name: Set up Python
uses: actions/[email protected]
Expand Down
7 changes: 3 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ module "runner-instance" {
environment = var.environment
iam_object_prefix = random_id.unique_prefix.hex

subnet_id = var.subnet_id == null ? element(module.vpc.private_subnets, 0) : var.subnet_id
vpc_id = var.vpc_id == null ? module.vpc.vpc_id : var.vpc_id
subnet_id = element(module.vpc.private_subnets, 0)

runner_ami_filter = var.runner_ami_filter
runner_worker_docker_machine_ami_filter = var.runner_worker_docker_machine_ami_filter
Expand Down Expand Up @@ -147,9 +147,8 @@ module "runner-instance" {
}

runner_worker_docker_machine_instance = {
types = var.runner_worker_docker_machine_instance_types
root_size = var.runner_worker_docker_machine_instance_root_size
subnet_ids = var.runner_worker_docker_machine_instance_subnet_ids
types = var.runner_worker_docker_machine_instance_types
root_size = var.runner_worker_docker_machine_instance_root_size
}

runner_networking = {
Expand Down
8 changes: 5 additions & 3 deletions variables.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
variable "vpc_id" {
description = "The VPC used for the runner and runner workers."
type = string
default = null
}

variable "runner_worker_docker_machine_instance_subnet_ids" {
description = "The Subnets used for the runner workers."
type = list(string)
variable "subnet_id" {
description = "The subnet used for the runner and runner workers."
type = string
default = null
}

variable "aws_region" {
Expand Down

0 comments on commit 228c184

Please sign in to comment.