Skip to content

Commit 18b4103

Browse files
authored
feat: upgrade default runner version to 14.0.1 (#341)
1 parent 708a758 commit 18b4103

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ terraform destroy
283283
| [aws_security_group_rule](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) |
284284
| [aws_ssm_parameter](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) |
285285
| [aws_subnet](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/subnet) |
286-
| [null_data_source](https://registry.terraform.io/providers/hashicorp/null/latest/docs/data-sources/data_source) |
287286
| [null_resource](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) |
288287

289288
## Inputs
@@ -332,7 +331,7 @@ terraform destroy
332331
| gitlab\_runner\_security\_group\_description | A description for the gitlab-runner security group | `string` | `"A security group containing gitlab-runner agent instances"` | no |
333332
| gitlab\_runner\_security\_group\_ids | A list of security group ids that are allowed to access the gitlab runner agent | `list(string)` | `[]` | no |
334333
| gitlab\_runner\_ssh\_cidr\_blocks | List of CIDR blocks to allow SSH Access to the gitlab runner instance. | `list(string)` | `[]` | no |
335-
| gitlab\_runner\_version | Version of the GitLab runner. | `string` | `"13.8.0"` | no |
334+
| gitlab\_runner\_version | Version of the GitLab runner. | `string` | `"14.0.1"` | no |
336335
| instance\_role\_json | Default runner instance override policy, expected to be in JSON format. | `string` | `""` | no |
337336
| instance\_type | Instance type used for the GitLab runner. | `string` | `"t3.micro"` | no |
338337
| kms\_alias\_name | Alias added to the kms\_key (if created and not provided by kms\_key\_id) | `string` | `""` | no |
@@ -342,6 +341,7 @@ terraform destroy
342341
| metrics\_autoscaling | A list of metrics to collect. The allowed values are GroupDesiredCapacity, GroupInServiceCapacity, GroupPendingCapacity, GroupMinSize, GroupMaxSize, GroupInServiceInstances, GroupPendingInstances, GroupStandbyInstances, GroupStandbyCapacity, GroupTerminatingCapacity, GroupTerminatingInstances, GroupTotalCapacity, GroupTotalInstances. | `list(string)` | `null` | no |
343342
| overrides | This maps provides the possibility to override some defaults. The following attributes are supported: `name_sg` overwrite the `Name` tag for all security groups created by this module. `name_runner_agent_instance` override the `Name` tag for the ec2 instance defined in the auto launch configuration. `name_docker_machine_runners` ovverrid the `Name` tag spot instances created by the runner agent. | `map(string)` | <pre>{<br> "name_docker_machine_runners": "",<br> "name_runner_agent_instance": "",<br> "name_sg": ""<br>}</pre> | no |
344343
| permissions\_boundary | Name of permissions boundary policy to attach to AWS IAM roles | `string` | `""` | no |
344+
| role\_tags | Map of tags that will be added to the role created. Useful for tag based authorization. | `map(string)` | `{}` | no |
345345
| runner\_ami\_filter | List of maps used to create the AMI filter for the Gitlab runner docker-machine AMI. | `map(list(string))` | <pre>{<br> "name": [<br> "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"<br> ]<br>}</pre> | no |
346346
| runner\_ami\_owners | The list of owners used to select the AMI of Gitlab runner docker-machine instances. | `list(string)` | <pre>[<br> "099720109477"<br>]</pre> | no |
347347
| runner\_iam\_policy\_arns | List of policy ARNs to be added to the instance profile of the gitlab runner agent ec2 instance. | `list(string)` | `[]` | no |
@@ -352,6 +352,7 @@ terraform destroy
352352
| runner\_tags | Map of tags that will be added to runner EC2 instances. | `map(string)` | `{}` | no |
353353
| runners\_additional\_volumes | Additional volumes that will be used in the runner config.toml, e.g Docker socket | `list(any)` | `[]` | no |
354354
| runners\_concurrent | Concurrent value for the runners, will be used in the runner config.toml. | `number` | `10` | no |
355+
| runners\_disable\_cache | Runners will not use local cache, will be used in the runner config.toml | `bool` | `false` | no |
355356
| runners\_docker\_runtime | docker runtime for runners, will be used in the runner config.toml | `string` | `""` | no |
356357
| runners\_ebs\_optimized | Enable runners to be EBS-optimized. | `bool` | `true` | no |
357358
| runners\_environment\_vars | Environment variables during build execution, e.g. KEY=Value, see runner-public example. Will be used in the runner config.toml | `list(string)` | `[]` | no |
@@ -377,7 +378,6 @@ terraform destroy
377378
| runners\_pre\_build\_script | Script to execute in the pipeline just before the build, will be used in the runner config.toml | `string` | `"\"\""` | no |
378379
| runners\_pre\_clone\_script | Commands to be executed on the Runner before cloning the Git repository. this can be used to adjust the Git client configuration first, for example. | `string` | `"\"\""` | no |
379380
| runners\_privileged | Runners will run in privileged mode, will be used in the runner config.toml | `bool` | `true` | no |
380-
| runners\_disable\_cache | Runners will not use local cache, will be used in the runner config.toml | `bool` | `false` | no |
381381
| runners\_pull\_policy | pull\_policy for the runners, will be used in the runner config.toml | `string` | `"always"` | no |
382382
| runners\_request\_concurrency | Limit number of concurrent requests for new jobs from GitLab (default 1) | `number` | `1` | no |
383383
| runners\_request\_spot\_instance | Whether or not to request spot instances via docker-machine | `bool` | `true` | no |

main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ resource "null_resource" "remove_runner" {
3838
}
3939

4040
locals {
41-
enable_asg_recreation = var.enable_forced_updates != null ? ! var.enable_forced_updates : var.enable_asg_recreation
41+
enable_asg_recreation = var.enable_forced_updates != null ? !var.enable_forced_updates : var.enable_asg_recreation
4242

4343
template_user_data = templatefile("${path.module}/template/user-data.tpl",
4444
{
@@ -125,7 +125,7 @@ locals {
125125
runners_root_size = var.runners_root_size
126126
runners_iam_instance_profile_name = var.runners_iam_instance_profile_name
127127
runners_use_private_address_only = var.runners_use_private_address
128-
runners_use_private_address = ! var.runners_use_private_address
128+
runners_use_private_address = !var.runners_use_private_address
129129
runners_request_spot_instance = var.runners_request_spot_instance
130130
runners_environment_vars = jsonencode(var.runners_environment_vars)
131131
runners_pre_build_script = var.runners_pre_build_script

variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ variable "cache_shared" {
359359
variable "gitlab_runner_version" {
360360
description = "Version of the GitLab runner."
361361
type = string
362-
default = "13.8.0"
362+
default = "14.0.1"
363363
}
364364

365365
variable "enable_ping" {

0 commit comments

Comments
 (0)