diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json index d190e87e..3b65b141 100644 --- a/.github/.release-please-manifest.json +++ b/.github/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "7.12.1" + ".": "7.13.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index c00a94b1..8b7d7c42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [7.13.0](https://github.com/cattle-ops/terraform-aws-gitlab-runner/compare/7.12.1...7.13.0) (2024-08-16) + + +### Features + +* add `update_interval` and `update_interval_when_expecting` ([#1173](https://github.com/cattle-ops/terraform-aws-gitlab-runner/issues/1173)) ([6d04322](https://github.com/cattle-ops/terraform-aws-gitlab-runner/commit/6d043222f540d1e0a7032c15ac95fd928535ca39)) + ## [7.12.1](https://github.com/cattle-ops/terraform-aws-gitlab-runner/compare/7.12.0...7.12.1) (2024-08-06) diff --git a/README.md b/README.md index 0006dc2c..73ccb5c8 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.61.0 | +| [aws](#provider\_aws) | 5.62.0 | | [local](#provider\_local) | 2.5.1 | | [tls](#provider\_tls) | 4.0.5 | @@ -208,7 +208,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file | [runner\_worker](#input\_runner\_worker) | For detailed information, check https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section.

environment\_variables = List of environment variables to add to the Runner Worker (environment).
max\_jobs = Number of jobs which can be processed in parallel by the Runner Worker.
output\_limit = Sets the maximum build log size in kilobytes. Default is 4MB (output\_limit).
request\_concurrency = Limit number of concurrent requests for new jobs from GitLab (default 1) (request\_concurrency).
ssm\_access = Allows to connect to the Runner Worker via SSM.
type = The Runner Worker type to use. Currently supports `docker+machine` or `docker` or `docker-autoscaler`. | 
object({
    environment_variables = optional(list(string), [])
    max_jobs              = optional(number, 0)
    output_limit          = optional(number, 4096)
    request_concurrency   = optional(number, 1)
    ssm_access            = optional(bool, false)
    type                  = optional(string, "docker+machine")
  })
| `{}` | no | | [runner\_worker\_cache](#input\_runner\_worker\_cache) | Configuration to control the creation of the cache bucket. By default the bucket will be created and used as shared
cache. To use the same cache across multiple Runner Worker disable the creation of the cache and provide a policy and
bucket name. See the public runner example for more details."

For detailed documentation check https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnerscaches3-section

access\_log\_bucker\_id = The ID of the bucket where the access logs are stored.
access\_log\_bucket\_prefix = The bucket prefix for the access logs.
authentication\_type = A string that declares the AuthenticationType for [runners.cache.s3]. Can either be 'iam' or 'credentials'
bucket = Name of the cache bucket. Requires `create = false`.
bucket\_prefix = Prefix for s3 cache bucket name. Requires `create = true`.
create = Boolean used to enable or disable the creation of the cache bucket.
create\_aws\_s3\_bucket\_public\_access\_block = Boolean used to enable or disable the creation of the public access block for the cache bucket. Useful when organizations do not allow the creation of public access blocks on individual buckets (e.g. public access is blocked on all buckets at the organization level).
expiration\_days = Number of days before cache objects expire. Requires `create = true`.
include\_account\_id = Boolean used to include the account id in the cache bucket name. Requires `create = true`.
policy = Policy to use for the cache bucket. Requires `create = false`.
random\_suffix = Boolean used to enable or disable the use of a random string suffix on the cache bucket name. Requires `create = true`.
shared = Boolean used to enable or disable the use of the cache bucket as shared cache.
versioning = Boolean used to enable versioning on the cache bucket. Requires `create = true`. | 
object({
    access_log_bucket_id                     = optional(string, null)
    access_log_bucket_prefix                 = optional(string, null)
    authentication_type                      = optional(string, "iam")
    bucket                                   = optional(string, "")
    bucket_prefix                            = optional(string, "")
    create                                   = optional(bool, true)
    create_aws_s3_bucket_public_access_block = optional(bool, true)
    expiration_days                          = optional(number, 1)
    include_account_id                       = optional(bool, true)
    policy                                   = optional(string, "")
    random_suffix                            = optional(bool, false)
    shared                                   = optional(bool, false)
    versioning                               = optional(bool, false)
  })
| `{}` | no | | [runner\_worker\_docker\_add\_dind\_volumes](#input\_runner\_worker\_docker\_add\_dind\_volumes) | Add certificates and docker.sock to the volumes to support docker-in-docker (dind) | `bool` | `false` | no | -| [runner\_worker\_docker\_autoscaler](#input\_runner\_worker\_docker\_autoscaler) | fleeting\_plugin\_version = The version of aws fleeting plugin
connector\_config\_user = User to connect to worker machine
key\_pair\_name = The name of the key pair used by the Runner to connect to the docker-machine Runner Workers. This variable is only supported when `enables` is set to `true`.
max\_use\_count = Max job number that can run on a worker | 
object({
    fleeting_plugin_version = optional(string, "1.0.0")
    connector_config_user   = optional(string, "ec2-user")
    key_pair_name           = optional(string, "runner-worker-key")
    max_use_count           = optional(number, 100)
  })
| `{}` | no | +| [runner\_worker\_docker\_autoscaler](#input\_runner\_worker\_docker\_autoscaler) | fleeting\_plugin\_version = The version of aws fleeting plugin
connector\_config\_user = User to connect to worker machine
key\_pair\_name = The name of the key pair used by the Runner to connect to the docker-machine Runner Workers. This variable is only supported when `enables` is set to `true`.
max\_use\_count = Max job number that can run on a worker
update\_interval = The interval to check with the fleeting plugin for instance updates.
update\_interval\_when\_expecting = The interval to check with the fleeting plugin for instance updates when expecting a state change. | 
object({
    fleeting_plugin_version        = optional(string, "1.0.0")
    connector_config_user          = optional(string, "ec2-user")
    key_pair_name                  = optional(string, "runner-worker-key")
    max_use_count                  = optional(number, 100)
    update_interval                = optional(string, "1m")
    update_interval_when_expecting = optional(string, "2s")
  })
| `{}` | no | | [runner\_worker\_docker\_autoscaler\_ami\_filter](#input\_runner\_worker\_docker\_autoscaler\_ami\_filter) | List of maps used to create the AMI filter for the Runner Worker. | `map(list(string))` | 
{
  "name": [
    "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"
  ]
}
| no | | [runner\_worker\_docker\_autoscaler\_ami\_owners](#input\_runner\_worker\_docker\_autoscaler\_ami\_owners) | The list of owners used to select the AMI of the Runner Worker. | `list(string)` | 
[
  "099720109477"
]
| no | | [runner\_worker\_docker\_autoscaler\_asg](#input\_runner\_worker\_docker\_autoscaler\_asg) | enable\_mixed\_instances\_policy = Make use of autoscaling-group mixed\_instances\_policy capacities to leverage pools and spot instances.
health\_check\_grace\_period = Time (in seconds) after instance comes into service before checking health
health\_check\_type = Controls how health checking is done. Values are - EC2 and ELB
instance\_refresh\_min\_healthy\_percentage = The amount of capacity in the Auto Scaling group that must remain healthy during an instance refresh to allow the operation to continue, as a percentage of the desired capacity of the Auto Scaling group.
instance\_refresh\_triggers = Set of additional property names that will trigger an Instance Refresh. A refresh will always be triggered by a change in any of launch\_configuration, launch\_template, or mixed\_instances\_policy.
max\_growth\_rate = The maximum number of machines that can be added to the runner in parallel.
on\_demand\_base\_capacity = Absolute minimum amount of desired capacity that must be fulfilled by on-demand instances.
on\_demand\_percentage\_above\_base\_capacity = Percentage split between on-demand and Spot instances above the base on-demand capacity.
override\_instance\_types = List to override the instance type in the Launch Template. Allow to spread spot instances on several types, to reduce interruptions
profile\_name = profile\_name = Name of the IAM profile to attach to the Runner Workers.
sg\_ingresses = Extra security group rule for workers
spot\_allocation\_strategy = How to allocate capacity across the Spot pools. 'lowest-price' to optimize cost, 'capacity-optimized' to reduce interruptions
spot\_instance\_pools = Number of Spot pools per availability zone to allocate capacity. EC2 Auto Scaling selects the cheapest Spot pools and evenly allocates Spot capacity across the number of Spot pools that you specify.
subnet\_ids = The list of subnet IDs to use for the Runner Worker when the fleet mode is enabled.
types = The type of instance to use for the Runner Worker. In case of fleet mode, multiple instance types are supported.
upgrade\_strategy = Auto deploy new instances when launch template changes. Can be either 'bluegreen', 'rolling' or 'off' | 
object({
    enable_mixed_instances_policy            = optional(bool, false)
    health_check_grace_period                = optional(number, 300)
    health_check_type                        = optional(string, "EC2")
    instance_refresh_min_healthy_percentage  = optional(number, 90)
    instance_refresh_triggers                = optional(list(string), [])
    max_growth_rate                          = optional(number, 0)
    on_demand_base_capacity                  = optional(number, 0)
    on_demand_percentage_above_base_capacity = optional(number, 100)
    profile_name                             = optional(string, "")
    spot_allocation_strategy                 = optional(string, "lowest-price")
    spot_instance_pools                      = optional(number, 2)
    subnet_ids                               = optional(list(string), [])
    types                                    = optional(list(string), ["m5.large"])
    upgrade_strategy                         = optional(string, "rolling")
    sg_ingresses = optional(list(object({
      description = string
      from_port   = number
      to_port     = number
      protocol    = string
      cidr_blocks = list(string)
    })), [])
  })
| `{}` | no | diff --git a/examples/runner-certificates/README.md b/examples/runner-certificates/README.md index 2742d32b..14885e92 100644 --- a/examples/runner-certificates/README.md +++ b/examples/runner-certificates/README.md @@ -139,7 +139,7 @@ For **user images**, you must: | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -| [aws](#requirement\_aws) | 5.61.0 | +| [aws](#requirement\_aws) | 5.62.0 | | [local](#requirement\_local) | 2.5.1 | | [null](#requirement\_null) | 3.2.2 | | [random](#requirement\_random) | 3.6.2 | @@ -149,21 +149,21 @@ For **user images**, you must: | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.61.0 | +| [aws](#provider\_aws) | 5.62.0 | ## Modules | Name | Source | Version | |------|--------|---------| | [runner](#module\_runner) | ../../ | n/a | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.0 | -| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.12.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.1 | +| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.12.1 | ## Resources | Name | Type | |------|------| -| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.61.0/docs/data-sources/availability_zones) | data source | +| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.62.0/docs/data-sources/availability_zones) | data source | ## Inputs diff --git a/examples/runner-default/README.md b/examples/runner-default/README.md index 87cd4682..e931ff3f 100644 --- a/examples/runner-default/README.md +++ b/examples/runner-default/README.md @@ -33,7 +33,7 @@ check `.terraform-version` for the tested version. | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -| [aws](#requirement\_aws) | 5.61.0 | +| [aws](#requirement\_aws) | 5.62.0 | | [local](#requirement\_local) | 2.5.1 | | [null](#requirement\_null) | 3.2.2 | | [random](#requirement\_random) | 3.6.2 | @@ -43,22 +43,22 @@ check `.terraform-version` for the tested version. | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.61.0 | +| [aws](#provider\_aws) | 5.62.0 | ## Modules | Name | Source | Version | |------|--------|---------| | [runner](#module\_runner) | ../../ | n/a | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.0 | -| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.12.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.1 | +| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.12.1 | ## Resources | Name | Type | |------|------| -| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.61.0/docs/data-sources/availability_zones) | data source | -| [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/5.61.0/docs/data-sources/security_group) | data source | +| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.62.0/docs/data-sources/availability_zones) | data source | +| [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/5.62.0/docs/data-sources/security_group) | data source | ## Inputs diff --git a/examples/runner-docker/README.md b/examples/runner-docker/README.md index c20efb38..b77e873a 100644 --- a/examples/runner-docker/README.md +++ b/examples/runner-docker/README.md @@ -36,7 +36,7 @@ check `.terraform-version` for the tested version. | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -| [aws](#requirement\_aws) | 5.61.0 | +| [aws](#requirement\_aws) | 5.62.0 | | [local](#requirement\_local) | 2.5.1 | | [null](#requirement\_null) | 3.2.2 | | [random](#requirement\_random) | 3.6.2 | @@ -46,21 +46,21 @@ check `.terraform-version` for the tested version. | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.61.0 | +| [aws](#provider\_aws) | 5.62.0 | ## Modules | Name | Source | Version | |------|--------|---------| | [runner](#module\_runner) | ../../ | n/a | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.0 | -| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.12.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.1 | +| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.12.1 | ## Resources | Name | Type | |------|------| -| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.61.0/docs/data-sources/availability_zones) | data source | +| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.62.0/docs/data-sources/availability_zones) | data source | ## Inputs diff --git a/examples/runner-fleeting-plugin/README.md b/examples/runner-fleeting-plugin/README.md index 7c8b19ab..18b6a45a 100644 --- a/examples/runner-fleeting-plugin/README.md +++ b/examples/runner-fleeting-plugin/README.md @@ -29,7 +29,7 @@ check `.terraform-version` for the tested version. | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -| [aws](#requirement\_aws) | 5.61.0 | +| [aws](#requirement\_aws) | 5.62.0 | | [local](#requirement\_local) | 2.5.1 | | [null](#requirement\_null) | 3.2.2 | | [random](#requirement\_random) | 3.6.2 | @@ -39,22 +39,22 @@ check `.terraform-version` for the tested version. | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.61.0 | +| [aws](#provider\_aws) | 5.62.0 | ## Modules | Name | Source | Version | |------|--------|---------| | [runner](#module\_runner) | ../../ | n/a | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.0 | -| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.12.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.1 | +| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.12.1 | ## Resources | Name | Type | |------|------| -| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.61.0/docs/data-sources/availability_zones) | data source | -| [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/5.61.0/docs/data-sources/security_group) | data source | +| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.62.0/docs/data-sources/availability_zones) | data source | +| [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/5.62.0/docs/data-sources/security_group) | data source | ## Inputs diff --git a/examples/runner-public/README.md b/examples/runner-public/README.md index c302a883..dce70a71 100644 --- a/examples/runner-public/README.md +++ b/examples/runner-public/README.md @@ -30,7 +30,7 @@ check `.terraform-version` for the tested version. | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -| [aws](#requirement\_aws) | 5.61.0 | +| [aws](#requirement\_aws) | 5.62.0 | | [local](#requirement\_local) | 2.5.1 | | [null](#requirement\_null) | 3.2.2 | | [random](#requirement\_random) | 3.6.2 | @@ -40,7 +40,7 @@ check `.terraform-version` for the tested version. | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.61.0 | +| [aws](#provider\_aws) | 5.62.0 | ## Modules @@ -49,13 +49,13 @@ check `.terraform-version` for the tested version. | [cache](#module\_cache) | ../../modules/cache | n/a | | [runner](#module\_runner) | ../../ | n/a | | [runner2](#module\_runner2) | ../../ | n/a | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.12.1 | ## Resources | Name | Type | |------|------| -| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.61.0/docs/data-sources/availability_zones) | data source | +| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.62.0/docs/data-sources/availability_zones) | data source | ## Inputs