From 715392b62f395b034f994e9768df7eda3145d480 Mon Sep 17 00:00:00 2001
From: Andrew Dryga <andrew@dryga.com>
Date: Fri, 8 Dec 2023 12:53:09 -0500
Subject: [PATCH] Use Ubuntu 24.04 LTS for our prod gateway deployments

---
 terraform/modules/gateway-google-cloud-compute/main.tf | 10 +++++-----
 .../templates/cloud-init.yaml                          | 10 ++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/terraform/modules/gateway-google-cloud-compute/main.tf b/terraform/modules/gateway-google-cloud-compute/main.tf
index d12c691b0..66d5f9930 100644
--- a/terraform/modules/gateway-google-cloud-compute/main.tf
+++ b/terraform/modules/gateway-google-cloud-compute/main.tf
@@ -55,9 +55,9 @@ locals {
 }
 
 # Fetch most recent COS image
-data "google_compute_image" "coreos" {
-  family  = "cos-109-lts"
-  project = "cos-cloud"
+data "google_compute_image" "ubuntu" {
+  family  = "ubuntu-2204-lts"
+  project = "ubuntu-os-cloud"
 }
 
 # Deploy app
@@ -75,7 +75,7 @@ resource "google_compute_instance_template" "application" {
   tags = local.application_tags
 
   labels = merge({
-    container-vm = data.google_compute_image.coreos.name
+    container-vm = data.google_compute_image.ubuntu.name
     version      = local.application_version
   }, local.application_labels)
 
@@ -86,7 +86,7 @@ resource "google_compute_instance_template" "application" {
   }
 
   disk {
-    source_image = data.google_compute_image.coreos.self_link
+    source_image = data.google_compute_image.ubuntu.self_link
     auto_delete  = true
     boot         = true
   }
diff --git a/terraform/modules/gateway-google-cloud-compute/templates/cloud-init.yaml b/terraform/modules/gateway-google-cloud-compute/templates/cloud-init.yaml
index 7774235da..9450b59d3 100644
--- a/terraform/modules/gateway-google-cloud-compute/templates/cloud-init.yaml
+++ b/terraform/modules/gateway-google-cloud-compute/templates/cloud-init.yaml
@@ -148,6 +148,16 @@ write_files:
       COMMIT
 
 runcmd:
+  - sudo apt update -y
+  - sudo apt install postgresql-client jq iperf3 -y
+  - sudo apt install apt-transport-https ca-certificates curl software-properties-common -y
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+  - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+  - sudo apt update -y
+  - sudo apt install docker-ce docker-ce-cli containerd.io -y
+  - sudo usermod -aG docker $(whoami)
+  - sudo systemctl enable docker
+  - sudo systemctl start docker
   - sudo ip6tables-restore < /etc/iptables/rules.v6
   - sudo systemctl daemon-reload
   - sudo systemctl start otel-collector.service