Skip to content

fix: don't apply extra labels unless defined #2181

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

Merged
npalm merged 2 commits into from
Jun 23, 2022
Merged

fix: don't apply extra labels unless defined #2181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f2492c
fix: don't apply extra labels unless defined
Jun 22, 2022
1dd99f9
Merge branch 'develop' into fix/extra_runner_labels
npalm Jun 23, 2022
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: 3 additions & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ locals {
id = module.ssm.parameters.github_app_id
key_base64 = module.ssm.parameters.github_app_key_base64
}

default_runner_labels = "self-hosted,${var.runner_os},${var.runner_architecture}"
}

resource "random_string" "random" {
Expand Down Expand Up @@ -112,7 +114,7 @@ module "webhook" {
# labels
enable_workflow_job_labels_check = var.runner_enable_workflow_job_labels_check
workflow_job_labels_check_all = var.runner_enable_workflow_job_labels_check_all
runner_labels = "self-hosted,${var.runner_os},${var.runner_architecture},${var.runner_extra_labels}"
runner_labels = var.runner_extra_labels != "" ? "${local.default_runner_labels},${var.runner_extra_labels}" : local.default_runner_labels

role_path = var.role_path
role_permissions_boundary = var.role_permissions_boundary
Expand Down