Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

terraform: update ubuntu 24.04, update ethtool #21

Merged
merged 4 commits into from
Aug 26, 2024
Merged

terraform: update ubuntu 24.04, update ethtool #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59c1eed
terraform: update OS to ubuntu-noble-24.04
clstokes Aug 26, 2024
d80fbd6
update azure
clstokes Aug 26, 2024
aed6786
update google
clstokes Aug 26, 2024
4d356ac
Update ethtool-udp.tftpl
clstokes Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion terraform/aws/internal-modules/aws-ec2-autoscaling/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion terraform/aws/internal-modules/aws-ec2-instance/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions terraform/azure/internal-modules/azure-linux-vm/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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"
}

Expand Down
2 changes: 1 addition & 1 deletion terraform/google/internal-modules/google-compute-instance/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
18 changes: 6 additions & 12 deletions ...m/internal-modules/tailscale-install-scripts/scripts/additional-scripts/ethtool-udp.tftpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Loading