You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
* add an IAM policy to grant the runner access to the KMS key ([#778](https://github.com/cattle-ops/terraform-aws-gitlab-runner/issues/778)) ([df25b6a](https://github.com/cattle-ops/terraform-aws-gitlab-runner/commit/df25b6ae06b7cbbb85c089fc45a181dce0aa1e00))
9
+
***spotfleet:** add supports spot fleets for spot instances allowing us to use multiple instance types and AZs ([#777](https://github.com/cattle-ops/terraform-aws-gitlab-runner/issues/777)) ([1bb7e11](https://github.com/cattle-ops/terraform-aws-gitlab-runner/commit/1bb7e1126e5d9f2950e5931cb19d691dcf579eb7))
|[aws_ami.docker-machine](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami)| data source |
546
548
|[aws_ami.runner](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami)| data source |
547
549
|[aws_availability_zone.runners](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zone)| data source |
@@ -584,7 +586,7 @@ Made with [contributors-img](https://contrib.rocks).
584
586
| <aname="input_docker_machine_iam_policy_arns"></a> [docker\_machine\_iam\_policy\_arns](#input\_docker\_machine\_iam\_policy\_arns)| List of policy ARNs to be added to the instance profile of the docker machine runners. |`list(string)`|`[]`| no |
585
587
| <aname="input_docker_machine_instance_metadata_options"></a> [docker\_machine\_instance\_metadata\_options](#input\_docker\_machine\_instance\_metadata\_options)| Enable the docker machine instances metadata service. Requires you use GitLab maintained docker machines. | <pre>object({<br> http_tokens = string<br> http_put_response_hop_limit = number<br> })</pre> | <pre>{<br> "http_put_response_hop_limit": 2,<br> "http_tokens": "required"<br>}</pre> | no |
586
588
| <aname="input_docker_machine_instance_type"></a> [docker\_machine\_instance\_type](#input\_docker\_machine\_instance\_type)| Instance type used for the instances hosting docker-machine. |`string`|`"m5.large"`| no |
587
-
| <aname="input_docker_machine_instance_types"></a> [docker\_machine\_instance\_types](#input\_docker\_machine\_instance\_types)| Instance types used for the instances hosting docker-machine. This variable is only supported when use\_fleet is set to true. |`list(string)`|`[]`| no |
589
+
| <aname="input_docker_machine_instance_types_fleet"></a> [docker\_machine\_instance\_types\_fleet](#input\_docker\_machine\_instance\_types\_fleet)| Instance types used for the instances hosting docker-machine. This variable is only supported when use\_fleet is set to true. |`list(string)`|`[]`| no |
588
590
| <aname="input_docker_machine_options"></a> [docker\_machine\_options](#input\_docker\_machine\_options)| List of additional options for the docker machine config. Each element of this list must be a key=value pair. E.g. '["amazonec2-zone=a"]' |`list(string)`|`[]`| no |
589
591
| <aname="input_docker_machine_role_json"></a> [docker\_machine\_role\_json](#input\_docker\_machine\_role\_json)| Docker machine runner instance override policy, expected to be in JSON format. |`string`|`""`| no |
590
592
| <aname="input_docker_machine_security_group_description"></a> [docker\_machine\_security\_group\_description](#input\_docker\_machine\_security\_group\_description)| A description for the docker-machine security group |`string`|`"A security group containing docker-machine instances"`| no |
@@ -603,17 +605,17 @@ Made with [contributors-img](https://contrib.rocks).
603
605
| <aname="input_environment"></a> [environment](#input\_environment)| A name that identifies the environment, used as prefix and for tagging. |`string`| n/a | yes |
604
606
| <aname="input_extra_security_group_ids_runner_agent"></a> [extra\_security\_group\_ids\_runner\_agent](#input\_extra\_security\_group\_ids\_runner\_agent)| Optional IDs of extra security groups to apply to the runner agent. This will not apply to the runners spun up when using the docker+machine executor, which is the default. |`list(string)`|`[]`| no |
605
607
| <aname="input_fleet_executor_subnet_ids"></a> [fleet\_executor\_subnet\_ids](#input\_fleet\_executor\_subnet\_ids)| List of subnets used for executors when the fleet mode is enabled. Must belong to the VPC specified above. |`list(string)`|`[]`| no |
608
+
| <aname="input_fleet_key_pair_name"></a> [fleet\_key\_pair\_name](#input\_fleet\_key\_pair\_name)| The name of the key pair used by the runner to connect to the docker-machine executors. |`string`|`"fleet-key"`| no |
| <aname="input_gitlab_runner_registration_config"></a> [gitlab\_runner\_registration\_config](#input\_gitlab\_runner\_registration\_config)| Configuration used to register the runner. See the README for an example, or reference the examples in the examples directory of this repo. |`map(string)`| <pre>{<br> "access_level": "",<br> "description": "",<br> "locked_to_project": "",<br> "maximum_timeout": "",<br> "registration_token": "",<br> "run_untagged": "",<br> "tag_list": ""<br>}</pre> | no |
608
611
| <aname="input_gitlab_runner_security_group_description"></a> [gitlab\_runner\_security\_group\_description](#input\_gitlab\_runner\_security\_group\_description)| A description for the gitlab-runner security group |`string`|`"A security group containing gitlab-runner agent instances"`| no |
609
612
| <aname="input_gitlab_runner_security_group_ids"></a> [gitlab\_runner\_security\_group\_ids](#input\_gitlab\_runner\_security\_group\_ids)| A list of security group ids that are allowed to access the gitlab runner agent |`list(string)`|`[]`| no |
610
613
| <aname="input_gitlab_runner_version"></a> [gitlab\_runner\_version](#input\_gitlab\_runner\_version)| Version of the [GitLab runner](https://gitlab.com/gitlab-org/gitlab-runner/-/releases). |`string`|`"15.8.2"`| no |
611
614
| <aname="input_instance_role_json"></a> [instance\_role\_json](#input\_instance\_role\_json)| Default runner instance override policy, expected to be in JSON format. |`string`|`""`| no |
612
615
| <aname="input_instance_type"></a> [instance\_type](#input\_instance\_type)| Instance type used for the GitLab runner. |`string`|`"t3.micro"`| no |
613
-
| <aname="input_key_pair_name"></a> [key\_pair\_name](#input\_key\_pair\_name)| The name of the key pair used by the runner to connect to the docker-machine executors. |`string`|`"fleet-key"`| no |
614
616
| <aname="input_kms_alias_name"></a> [kms\_alias\_name](#input\_kms\_alias\_name)| Alias added to the kms\_key (if created and not provided by kms\_key\_id) |`string`|`""`| no |
615
617
| <aname="input_kms_deletion_window_in_days"></a> [kms\_deletion\_window\_in\_days](#input\_kms\_deletion\_window\_in\_days)| Key rotation window, set to 0 for no rotation. Only used when `enable_kms` is set to `true`. |`number`|`7`| no |
616
-
| <aname="input_kms_key_id"></a> [kms\_key\_id](#input\_kms\_key\_id)| KMS key id to encrypted the resources. Ensure CloudWatch and Runner/Executor have access to the provided KMS key. |`string`|`""`| no |
618
+
| <aname="input_kms_key_id"></a> [kms\_key\_id](#input\_kms\_key\_id)| KMS key ARN to encrypt the resources. Ensure CloudWatch has access to the provided KMS key (see policies/kms-policy.json). |`string`|`""`| no |
617
619
| <aname="input_log_group_name"></a> [log\_group\_name](#input\_log\_group\_name)| Option to override the default name (`environment`) of the log group, requires `enable_cloudwatch_logging = true`. |`string`|`null`| no |
618
620
| <aname="input_metrics_autoscaling"></a> [metrics\_autoscaling](#input\_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 |
619
621
| <aname="input_overrides"></a> [overrides](#input\_overrides)| This map provides the possibility to override some defaults.<br>The following attributes are supported:<br> * `name_sg` set the name prefix and overwrite the `Name` tag for all security groups created by this module.<br> * `name_runner_agent_instance` set the name prefix and override the `Name` tag for the EC2 gitlab runner instances defined in the auto launch configuration.<br> * `name_docker_machine_runners` override the `Name` tag of EC2 instances created by the runner agent (used as name prefix for `docker_machine_version` >= 0.16.2).<br> * `name_iam_objects` set the name prefix of all AWS IAM resources created by this module. |`map(string)`| <pre>{<br> "name_docker_machine_runners": "",<br> "name_iam_objects": "",<br> "name_runner_agent_instance": "",<br> "name_sg": ""<br>}</pre> | no |
![cattle-ops-releaser[bot]](https://avatars.githubusercontent.com/in/298262?v=4&size=40){kind=avatar}
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?v=4&size=40){kind=avatar}
0 commit comments