Skip to content

Commit a7847fa

Browse files
committed
remove use_fleet from runner config
1 parent e2213c4 commit a7847fa

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

main.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ locals {
7878
gitlab_runner_access_level = var.runner_gitlab_registration_config.access_level
7979
sentry_dsn = var.runner_manager.sentry_dsn
8080
public_key = var.runner_worker.use_private_key && var.runner_worker.type == "docker-autoscaler" ? tls_private_key.autoscaler[0].public_key_openssh : var.runner_worker_docker_machine_fleet.enable == true ? tls_private_key.fleet[0].public_key_openssh : ""
81-
use_fleet = var.runner_worker_docker_machine_fleet.enable
8281
private_key = var.runner_worker.use_private_key && var.runner_worker.type == "docker-autoscaler" ? tls_private_key.autoscaler[0].private_key_pem : var.runner_worker_docker_machine_fleet.enable == true ? tls_private_key.fleet[0].private_key_pem : ""
83-
use_private_key = var.runner_worker.use_private_key && var.runner_worker.type == "docker-autoscaler"
82+
use_private_key = var.runner_worker_docker_machine_fleet.enable || (var.runner_worker.use_private_key && var.runner_worker.type == "docker-autoscaler")
8483
use_new_runner_authentication_gitlab_16 = var.runner_gitlab_registration_config.type != ""
8584
user_data_trace_log = var.debug.trace_runner_user_data
8685
fleeting_plugin_version = var.runner_worker_docker_autoscaler.fleeting_plugin_version

template/gitlab-runner.tftpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ else
130130
sed -i.bak s/__REPLACED_BY_USER_DATA__/$token/g /etc/gitlab-runner/config.toml
131131
fi
132132

133-
if [[ "${use_fleet}" == "true" || "${use_private_key}" == "true" ]]
133+
if [[ "${use_private_key}" == "true" ]]
134134
then
135135
echo "${public_key}" > /root/.ssh/id_rsa.pub
136136
echo "${private_key}" > /root/.ssh/id_rsa

0 commit comments

Comments
 (0)