From 59c1eedb1cea2f7d1312153cb4e63cdd91b028b6 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Mon, 26 Aug 2024 09:52:48 -0700 Subject: [PATCH 1/4] terraform: update OS to ubuntu-noble-24.04 updates #17 --- terraform/aws/internal-modules/aws-ec2-autoscaling/main.tf | 2 +- terraform/aws/internal-modules/aws-ec2-instance/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/aws/internal-modules/aws-ec2-autoscaling/main.tf b/terraform/aws/internal-modules/aws-ec2-autoscaling/main.tf index 3b82991..f8d94f5 100644 --- a/terraform/aws/internal-modules/aws-ec2-autoscaling/main.tf +++ b/terraform/aws/internal-modules/aws-ec2-autoscaling/main.tf @@ -27,7 +27,7 @@ data "aws_ami" "ubuntu" { filter { name = "name" - values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*"] + values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-*-server-*"] } filter { diff --git a/terraform/aws/internal-modules/aws-ec2-instance/main.tf b/terraform/aws/internal-modules/aws-ec2-instance/main.tf index f571791..344f42a 100644 --- a/terraform/aws/internal-modules/aws-ec2-instance/main.tf +++ b/terraform/aws/internal-modules/aws-ec2-instance/main.tf @@ -15,7 +15,7 @@ data "aws_ami" "ubuntu" { filter { name = "name" - values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*"] + values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-*-server-*"] } filter { From d80fbd6af4c043248342a5d466da6d36d5e3a3c1 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Mon, 26 Aug 2024 09:52:53 -0700 Subject: [PATCH 2/4] update azure --- terraform/azure/internal-modules/azure-linux-vm/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/azure/internal-modules/azure-linux-vm/main.tf b/terraform/azure/internal-modules/azure-linux-vm/main.tf index 6b378dc..34f4445 100644 --- a/terraform/azure/internal-modules/azure-linux-vm/main.tf +++ b/terraform/azure/internal-modules/azure-linux-vm/main.tf @@ -23,7 +23,7 @@ resource "azurerm_network_interface" "primary" { private_ip_address_allocation = "Dynamic" public_ip_address_id = var.public_ip_address_id } - enable_ip_forwarding = module.tailscale_install_scripts.ip_forwarding_required + ip_forwarding_enabled = module.tailscale_install_scripts.ip_forwarding_required } resource "azurerm_network_interface_security_group_association" "tailscale" { @@ -73,8 +73,8 @@ resource "azurerm_linux_virtual_machine" "tailscale_instance" { source_image_reference { publisher = "Canonical" - offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts-gen2" + offer = "ubuntu-24_04-lts" + sku = "server" version = "latest" } From aed67861a7b073d4b55c0fddc67c62185271fb6a Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Mon, 26 Aug 2024 10:07:09 -0700 Subject: [PATCH 3/4] update google --- .../google/internal-modules/google-compute-instance/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/google/internal-modules/google-compute-instance/main.tf b/terraform/google/internal-modules/google-compute-instance/main.tf index 61c1691..9c5f572 100644 --- a/terraform/google/internal-modules/google-compute-instance/main.tf +++ b/terraform/google/internal-modules/google-compute-instance/main.tf @@ -45,7 +45,7 @@ resource "google_compute_firewall" "tailscale_ingress_ipv6" { data "google_compute_image" "ubuntu" { project = "ubuntu-os-cloud" - family = "ubuntu-2204-lts" + family = "ubuntu-2404-lts-amd64" } resource "google_compute_instance" "tailscale_instance" { From 4d356ac54b0bd383b12b6ae0a1d09c2e97221fd7 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Mon, 26 Aug 2024 12:46:35 -0700 Subject: [PATCH 4/4] Update ethtool-udp.tftpl --- .../additional-scripts/ethtool-udp.tftpl | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/terraform/internal-modules/tailscale-install-scripts/scripts/additional-scripts/ethtool-udp.tftpl b/terraform/internal-modules/tailscale-install-scripts/scripts/additional-scripts/ethtool-udp.tftpl index f868439..8a3d513 100644 --- a/terraform/internal-modules/tailscale-install-scripts/scripts/additional-scripts/ethtool-udp.tftpl +++ b/terraform/internal-modules/tailscale-install-scripts/scripts/additional-scripts/ethtool-udp.tftpl @@ -6,19 +6,13 @@ echo -e '\n#\n# Beginning ethtool udp optimization configuration...\n#\n' -NETDEV=$(ip route show 0/0 | cut -f5 -d' ') +NETDEV=$(ip -o route get 8.8.8.8 | cut -f 5 -d " ") +sudo ethtool -K $NETDEV rx-udp-gro-forwarding on rx-gro-list off -for d in $NETDEV; do - ethtool -K $d rx-udp-gro-forwarding on rx-gro-list off - if [ "$?" -ne "0" ]; then - echo -e '\n#\n# ERROR: ethtool udp optimization failed.\n#\n' - exit 1 - fi -done +printf '#!/bin/sh\n\nethtool -K %s rx-udp-gro-forwarding on rx-gro-list off \n' "$(ip -o route get 8.8.8.8 | cut -f 5 -d " ")" | sudo tee /etc/networkd-dispatcher/routable.d/50-tailscale +sudo chmod 755 /etc/networkd-dispatcher/routable.d/50-tailscale -for d in $NETDEV; do - printf '#!/bin/bash\n\nethtool -K %s rx-udp-gro-forwarding on rx-gro-list off \n' $d | sudo tee /etc/networkd-dispatcher/routable.d/50-tailscale-$d - chmod 755 /etc/networkd-dispatcher/routable.d/50-tailscale-$d -done +sudo /etc/networkd-dispatcher/routable.d/50-tailscale +test $? -eq 0 || echo 'An error occurred.' echo -e '\n#\n# Complete.\n#\n'