Skip to content

Commit 585afba

Browse files
coibibkayman-mk
authored andcommitted
fix if statement and add comment
Signed-off-by: François Bibron <[email protected]>
1 parent e7f25a4 commit 585afba

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

template/gitlab-runner.tftpl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,18 @@ fi
4747

4848
if [[ "${runners_token}" == "__REPLACED_BY_USER_DATA__" && "$token" == "null" ]] || [[ "$valid_token" == "false" ]]
4949
then
50-
if [[ ! "${gitlab_runner_version}" < "16.0.0" ]]
50+
if [[ "${gitlab_runner_version}" < "16.0.0" ]]
5151
then
52+
token=$(curl ${curl_cacert} --request POST -L "${runners_gitlab_url}/api/v4/runners" \
53+
--form "token=$gitlab_runner_registration_token" \
54+
--form "tag_list=${gitlab_runner_tag_list}" \
55+
--form "description=${gitlab_runner_description}" \
56+
--form "locked=${gitlab_runner_locked_to_project}" \
57+
--form "run_untagged=${gitlab_runner_run_untagged}" \
58+
--form "maximum_timeout=${gitlab_runner_maximum_timeout}" \
59+
--form "access_level=${gitlab_runner_access_level}" \
60+
| jq -r .token)
61+
else
5262
runner_type_param=""
5363
if [ "${gitlab_runner_type}" = "group_type" ]; then
5464
runner_type_param='--form group_id=${gitlab_runner_group_id}'
@@ -67,16 +77,6 @@ then
6777
$runner_type_param \
6878
--form "access_level=${gitlab_runner_access_level}" \
6979
| jq -r '.token')
70-
else
71-
token=$(curl ${curl_cacert} --request POST -L "${runners_gitlab_url}/api/v4/runners" \
72-
--form "token=$gitlab_runner_registration_token" \
73-
--form "tag_list=${gitlab_runner_tag_list}" \
74-
--form "description=${gitlab_runner_description}" \
75-
--form "locked=${gitlab_runner_locked_to_project}" \
76-
--form "run_untagged=${gitlab_runner_run_untagged}" \
77-
--form "maximum_timeout=${gitlab_runner_maximum_timeout}" \
78-
--form "access_level=${gitlab_runner_access_level}" \
79-
| jq -r .token)
8080
fi
8181
aws ssm put-parameter --overwrite --type SecureString --name "${secure_parameter_store_runner_token_key}" --value="$token" --region "${secure_parameter_store_region}"
8282
fi

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ variable "gitlab_runner_registration_config" {
612612

613613
default = {
614614
registration_token = ""
615-
type = ""
615+
type = "" # mandatory if gitlab_runner_version >= 16.0.0
616616
group_id = "" # mandatory if type is group_type
617617
project_id = "" # mandatory if type is project_type
618618
tag_list = ""

0 commit comments

Comments
 (0)