From e4d971a636ce4e518bde00c195cbdecb07501c9a Mon Sep 17 00:00:00 2001 From: Kieran Brown Date: Fri, 26 Jan 2024 09:41:50 +0000 Subject: [PATCH 1/2] Update to use latest fkc-nat AL2023 AMI --- README.md | 6 ++---- ec2.tf | 2 +- variables.tf | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 79f03e5..90908d9 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,10 @@ A Terraform module for deploying NAT Instances using [fck-nat](https://github.co The following is a list of features available with this module: - High-availability mode achieved through a floating internal ENI automatically attached to instances being started by an ASG -- Optional consistent static IP via EIP re-attachment to the internet facing ENI **\*** -- Cloudwatch metrics reported similar to those available with the managed NAT Gateway **\*** +- Optional consistent static IP via EIP re-attachment to the internet facing ENI +- Cloudwatch metrics reported similar to those available with the managed NAT Gateway - Use of spot instances instead of on-demand for reduced costs -**Features marked with a * may not be published as part of the latest fck-nat version and may require you to build the AMI yourself yourself to use them.** - ## Example ```hcl diff --git a/ec2.tf b/ec2.tf index 24c21cd..284c178 100644 --- a/ec2.tf +++ b/ec2.tf @@ -6,7 +6,7 @@ data "aws_ami" "main" { filter { name = "name" - values = ["fck-nat-amzn2-hvm-*"] + values = ["fck-nat-al2023-hvm-*"] } filter { diff --git a/variables.tf b/variables.tf index 8d01029..079a5d2 100644 --- a/variables.tf +++ b/variables.tf @@ -70,7 +70,7 @@ variable "ami_id" { variable "ebs_root_volume_size" { description = "Size of the EBS root volume in GB" type = number - default = 2 + default = 8 } variable "eip_allocation_ids" { From 9ec4e7d779eb4c629677ed242dd9c51b0ff9e4ac Mon Sep 17 00:00:00 2001 From: Kieran Brown Date: Mon, 29 Jan 2024 09:14:05 +0000 Subject: [PATCH 2/2] Update docs --- README.md | 4 ++-- docs/header.md | 6 ++---- examples/full/README.md | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 90908d9..590789a 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ module "fck-nat" { | [ami\_id](#input\_ami\_id) | AMI to use for the NAT instance. Uses fck-nat latest AMI in the region if none provided | `string` | `null` | no | | [cloudwatch\_agent\_configuration](#input\_cloudwatch\_agent\_configuration) | CloudWatch configuration for the NAT instance | 
object({
    namespace           = optional(string, "fck-nat"),
    collection_interval = optional(number, 60),
    endpoint_override   = optional(string, "")
  })
| 
{
  "collection_interval": 60,
  "endpoint_override": "",
  "namespace": "fck-nat"
}
| no | | [cloudwatch\_agent\_configuration\_param\_arn](#input\_cloudwatch\_agent\_configuration\_param\_arn) | ARN of the SSM parameter containing the CloudWatch agent configuration. If none provided, creates one | `string` | `null` | no | -| [ebs\_root\_volume\_size](#input\_ebs\_root\_volume\_size) | Size of the EBS root volume in GB | `number` | `2` | no | +| [ebs\_root\_volume\_size](#input\_ebs\_root\_volume\_size) | Size of the EBS root volume in GB | `number` | `8` | no | | [eip\_allocation\_ids](#input\_eip\_allocation\_ids) | EIP allocation IDs to use for the NAT instance. Automatically assign a public IP if none is provided. Note: Currently only supports at most one EIP allocation. | `list(string)` | `[]` | no | | [encryption](#input\_encryption) | Whether or not to encrypt the EBS volume | `bool` | `true` | no | | [ha\_mode](#input\_ha\_mode) | Whether or not high-availability mode should be enabled via autoscaling group | `bool` | `true` | no | @@ -111,4 +111,4 @@ module "fck-nat" { | [security\_group\_id](#output\_security\_group\_id) | Deprecated. The ID of the security group used by fck-nat ENIs | | [security\_group\_ids](#output\_security\_group\_ids) | List of security group IDs used by fck-nat ENIs | | [subnet\_id](#output\_subnet\_id) | Subnet ID to which the fck-nat instance is deployed into | -| [vpc\_id](#output\_vpc\_id) | VPC ID to which the fck-nat instance is deployed into | \ No newline at end of file +| [vpc\_id](#output\_vpc\_id) | VPC ID to which the fck-nat instance is deployed into | diff --git a/docs/header.md b/docs/header.md index b7fd0a0..84cb4ea 100644 --- a/docs/header.md +++ b/docs/header.md @@ -6,12 +6,10 @@ A Terraform module for deploying NAT Instances using [fck-nat](https://github.co The following is a list of features available with this module: - High-availability mode achieved through a floating internal ENI automatically attached to instances being started by an ASG -- Optional consistent static IP via EIP re-attachment to the internet facing ENI **\*** -- Cloudwatch metrics reported similar to those available with the managed NAT Gateway **\*** +- Optional consistent static IP via EIP re-attachment to the internet facing ENI +- Cloudwatch metrics reported similar to those available with the managed NAT Gateway - Use of spot instances instead of on-demand for reduced costs -**Features marked with a * may not be published as part of the latest fck-nat version and may require you to build the AMI yourself yourself to use them.** - ## Example ```hcl diff --git a/examples/full/README.md b/examples/full/README.md index 31f7cdf..7be5855 100644 --- a/examples/full/README.md +++ b/examples/full/README.md @@ -29,7 +29,7 @@ $ terraform apply | Name | Source | Version | |------|--------|---------| -| [fck-nat](#module\_fck-nat) | ../ | n/a | +| [fck-nat](#module\_fck-nat) | ../../ | n/a | ## Resources