Skip to content

Commit 80d208c

Browse files
authored
terraform: update ubuntu 24.04, update ethtool (#21)
1 parent 20c06bc commit 80d208c

File tree

5 files changed

+12
-18
lines changed
  • terraform
    • aws/internal-modules
    • azure/internal-modules/azure-linux-vm
    • google/internal-modules/google-compute-instance
    • internal-modules/tailscale-install-scripts/scripts/additional-scripts

5 files changed

+12
-18
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data "aws_ami" "ubuntu" {
2727

2828
filter {
2929
name = "name"
30-
values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*"]
30+
values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-*-server-*"]
3131
}
3232

3333
filter {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ data "aws_ami" "ubuntu" {
1515

1616
filter {
1717
name = "name"
18-
values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*"]
18+
values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-*-server-*"]
1919
}
2020

2121
filter {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ resource "azurerm_network_interface" "primary" {
2323
private_ip_address_allocation = "Dynamic"
2424
public_ip_address_id = var.public_ip_address_id
2525
}
26-
enable_ip_forwarding = module.tailscale_install_scripts.ip_forwarding_required
26+
ip_forwarding_enabled = module.tailscale_install_scripts.ip_forwarding_required
2727
}
2828

2929
resource "azurerm_network_interface_security_group_association" "tailscale" {
@@ -73,8 +73,8 @@ resource "azurerm_linux_virtual_machine" "tailscale_instance" {
7373

7474
source_image_reference {
7575
publisher = "Canonical"
76-
offer = "0001-com-ubuntu-server-jammy"
77-
sku = "22_04-lts-gen2"
76+
offer = "ubuntu-24_04-lts"
77+
sku = "server"
7878
version = "latest"
7979
}
8080

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ resource "google_compute_firewall" "tailscale_ingress_ipv6" {
4545

4646
data "google_compute_image" "ubuntu" {
4747
project = "ubuntu-os-cloud"
48-
family = "ubuntu-2204-lts"
48+
family = "ubuntu-2404-lts-amd64"
4949
}
5050

5151
resource "google_compute_instance" "tailscale_instance" {

terraform/internal-modules/tailscale-install-scripts/scripts/additional-scripts/ethtool-udp.tftpl

+6-12
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,13 @@
66

77
echo -e '\n#\n# Beginning ethtool udp optimization configuration...\n#\n'
88

9-
NETDEV=$(ip route show 0/0 | cut -f5 -d' ')
9+
NETDEV=$(ip -o route get 8.8.8.8 | cut -f 5 -d " ")
10+
sudo ethtool -K $NETDEV rx-udp-gro-forwarding on rx-gro-list off
1011

11-
for d in $NETDEV; do
12-
ethtool -K $d rx-udp-gro-forwarding on rx-gro-list off
13-
if [ "$?" -ne "0" ]; then
14-
echo -e '\n#\n# ERROR: ethtool udp optimization failed.\n#\n'
15-
exit 1
16-
fi
17-
done
12+
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
13+
sudo chmod 755 /etc/networkd-dispatcher/routable.d/50-tailscale
1814

19-
for d in $NETDEV; do
20-
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
21-
chmod 755 /etc/networkd-dispatcher/routable.d/50-tailscale-$d
22-
done
15+
sudo /etc/networkd-dispatcher/routable.d/50-tailscale
16+
test $? -eq 0 || echo 'An error occurred.'
2317

2418
echo -e '\n#\n# Complete.\n#\n'

0 commit comments

Comments
 (0)