diff --git a/README.md b/README.md index 0dbcebada..7264a1a8d 100644 --- a/README.md +++ b/README.md @@ -283,7 +283,6 @@ terraform destroy | [aws_security_group_rule](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | | [aws_ssm_parameter](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | | [aws_subnet](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/subnet) | -| [null_data_source](https://registry.terraform.io/providers/hashicorp/null/latest/docs/data-sources/data_source) | | [null_resource](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | ## Inputs @@ -332,7 +331,7 @@ terraform destroy | gitlab\_runner\_security\_group\_description | A description for the gitlab-runner security group | `string` | `"A security group containing gitlab-runner agent instances"` | no | | gitlab\_runner\_security\_group\_ids | A list of security group ids that are allowed to access the gitlab runner agent | `list(string)` | `[]` | no | | gitlab\_runner\_ssh\_cidr\_blocks | List of CIDR blocks to allow SSH Access to the gitlab runner instance. | `list(string)` | `[]` | no | -| gitlab\_runner\_version | Version of the GitLab runner. | `string` | `"13.8.0"` | no | +| gitlab\_runner\_version | Version of the GitLab runner. | `string` | `"14.0.1"` | no | | instance\_role\_json | Default runner instance override policy, expected to be in JSON format. | `string` | `""` | no | | instance\_type | Instance type used for the GitLab runner. | `string` | `"t3.micro"` | no | | 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 | 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 | | 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)` |
{| no | | permissions\_boundary | Name of permissions boundary policy to attach to AWS IAM roles | `string` | `""` | no | +| role\_tags | Map of tags that will be added to the role created. Useful for tag based authorization. | `map(string)` | `{}` | no | | runner\_ami\_filter | List of maps used to create the AMI filter for the Gitlab runner docker-machine AMI. | `map(list(string))` |
"name_docker_machine_runners": "",
"name_runner_agent_instance": "",
"name_sg": ""
}
{| no | | runner\_ami\_owners | The list of owners used to select the AMI of Gitlab runner docker-machine instances. | `list(string)` |
"name": [
"ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"
]
}
[| no | | 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 | runner\_tags | Map of tags that will be added to runner EC2 instances. | `map(string)` | `{}` | no | | runners\_additional\_volumes | Additional volumes that will be used in the runner config.toml, e.g Docker socket | `list(any)` | `[]` | no | | runners\_concurrent | Concurrent value for the runners, will be used in the runner config.toml. | `number` | `10` | no | +| runners\_disable\_cache | Runners will not use local cache, will be used in the runner config.toml | `bool` | `false` | no | | runners\_docker\_runtime | docker runtime for runners, will be used in the runner config.toml | `string` | `""` | no | | runners\_ebs\_optimized | Enable runners to be EBS-optimized. | `bool` | `true` | no | | 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 | runners\_pre\_build\_script | Script to execute in the pipeline just before the build, will be used in the runner config.toml | `string` | `"\"\""` | no | | 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 | | runners\_privileged | Runners will run in privileged mode, will be used in the runner config.toml | `bool` | `true` | no | -| runners\_disable\_cache | Runners will not use local cache, will be used in the runner config.toml | `bool` | `false` | no | | runners\_pull\_policy | pull\_policy for the runners, will be used in the runner config.toml | `string` | `"always"` | no | | runners\_request\_concurrency | Limit number of concurrent requests for new jobs from GitLab (default 1) | `number` | `1` | no | | runners\_request\_spot\_instance | Whether or not to request spot instances via docker-machine | `bool` | `true` | no | diff --git a/main.tf b/main.tf index 493b16e4c..db9d1a5db 100644 --- a/main.tf +++ b/main.tf @@ -38,7 +38,7 @@ resource "null_resource" "remove_runner" { } locals { - enable_asg_recreation = var.enable_forced_updates != null ? ! var.enable_forced_updates : var.enable_asg_recreation + enable_asg_recreation = var.enable_forced_updates != null ? !var.enable_forced_updates : var.enable_asg_recreation template_user_data = templatefile("${path.module}/template/user-data.tpl", { @@ -125,7 +125,7 @@ locals { runners_root_size = var.runners_root_size runners_iam_instance_profile_name = var.runners_iam_instance_profile_name runners_use_private_address_only = var.runners_use_private_address - runners_use_private_address = ! var.runners_use_private_address + runners_use_private_address = !var.runners_use_private_address runners_request_spot_instance = var.runners_request_spot_instance runners_environment_vars = jsonencode(var.runners_environment_vars) runners_pre_build_script = var.runners_pre_build_script diff --git a/variables.tf b/variables.tf index 759c3b985..df36d6f43 100644 --- a/variables.tf +++ b/variables.tf @@ -359,7 +359,7 @@ variable "cache_shared" { variable "gitlab_runner_version" { description = "Version of the GitLab runner." type = string - default = "13.8.0" + default = "14.0.1" } variable "enable_ping" {
"099720109477"
]