Skip to content

Commit 19732b3

Browse files
committed
terraform: remove source dest check instance property
Disabling source/destination checks (https://docs.aws.amazon.com/vpc/latest/userguide/work-with-nat-instances.html#EIP_Disable_SrcDestCheck) is only required when `--snat-subnet-routes=false`. Remove the property from the examples to eliminate confusion.
1 parent 63fd22c commit 19732b3

File tree

6 files changed

+2
-11
lines changed
  • terraform
    • aws
      • aws-ec2-autoscaling-dual-subnet
      • internal-modules/aws-ec2-instance
    • azure/internal-modules/azure-linux-vm
    • google/internal-modules/google-compute-instance
    • internal-modules/tailscale-install-scripts

6 files changed

+2
-11
lines changed

terraform/aws/aws-ec2-autoscaling-dual-subnet/main.tf

-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ resource "aws_network_interface" "secondary" {
6868
subnet_id = local.private_subnet_id
6969
security_groups = local.security_group_ids
7070
tags = merge(local.aws_tags, { Name = "${local.name}-secondary" })
71-
72-
source_dest_check = false
7371
}
7472

7573
module "tailscale_aws_ec2_autoscaling" {

terraform/aws/internal-modules/aws-ec2-instance/main.tf

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ resource "aws_instance" "tailscale_instance" {
3737
subnet_id = var.subnet_id
3838
vpc_security_group_ids = var.vpc_security_group_ids
3939
ipv6_address_count = var.ipv6_address_count
40-
source_dest_check = !module.tailscale_install_scripts.ip_forwarding_required
4140

4241
iam_instance_profile = var.instance_profile_name
4342

terraform/azure/internal-modules/azure-linux-vm/main.tf

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ resource "azurerm_network_interface" "primary" {
2323
private_ip_address_allocation = "Dynamic"
2424
public_ip_address_id = var.public_ip_address_id
2525
}
26-
ip_forwarding_enabled = module.tailscale_install_scripts.ip_forwarding_required
2726
}
2827

2928
resource "azurerm_network_interface_security_group_association" "tailscale" {

terraform/google/internal-modules/google-compute-instance/main.tf

-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ resource "google_compute_instance" "tailscale_instance" {
4040
tags = var.instance_tags
4141

4242
metadata_startup_script = module.tailscale_install_scripts.ubuntu_install_script
43-
can_ip_forward = module.tailscale_install_scripts.ip_forwarding_required
4443
}

terraform/internal-modules/tailscale-install-scripts/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ locals {
3232
"--hostname=${var.tailscale_hostname}",
3333
]
3434

35-
ip_forwarding_required = length([for x in ["--advertise-exit-node", "--advertise-connector", "--advertise-routes"] : x if strcontains(x, "advertisfe")]) > 0
36-
ip_forwarding_script = local.ip_forwarding_required ? "" : templatefile("${path.module}/scripts/additional-scripts/ip-forwarding.tftpl", {})
35+
ip_forwarding_required = length([for x in var.tailscale_set_preferences : x if strcontains(x, "advertise")]) > 0
36+
ip_forwarding_script = local.ip_forwarding_required == false ? "" : templatefile("${path.module}/scripts/additional-scripts/ip-forwarding.tftpl", {})
3737

3838
ethtool_udp_optimization_script = templatefile("${path.module}/scripts/additional-scripts/ethtool-udp.tftpl", {})
3939
}

terraform/internal-modules/tailscale-install-scripts/outputs.tf

-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ output "ubuntu_install_script_base64_encoded" {
66
value = base64encode(local.ubuntu_install_script)
77
}
88

9-
output "ip_forwarding_required" {
10-
value = local.ip_forwarding_required
11-
}
12-
139
output "ubuntu_install_script_md5" {
1410
description = "MD5 hash of the VM user_data script - for detecting changes"
1511
value = md5(local.ubuntu_install_script)

0 commit comments

Comments
 (0)