fix: update VMs to use Ubuntu 24.04 (#280)

* fix: update VMs to use Ubuntu 24.04

Signed-off-by: chjmil <[email protected]>

* chore: update comment

Signed-off-by: chjmil <[email protected]>

---------

Signed-off-by: chjmil <[email protected]>

Author: saschjmil

.github/release-drafter.yml

@@ -28,6 +28,7 @@ categories:
       - 'refactor'
       - 'revert'
       - 'style'
+      - 'revert'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
 version-resolver:

.github/workflows/conventional-commits.yml

@@ -14,5 +14,5 @@ jobs:
       - name: PR Conventional Commit Validation
         uses:  ytanikin/[email protected]
         with:
-          task_types: '["fix", "feat", "build", "chore", "ci", "docs", "style", "refactor", "perf", "test"]'
+          task_types: '["fix", "feat", "build", "chore", "ci", "docs", "style", "refactor", "perf", "test", "revert"]'
           custom_labels: '{"feat": "enhancement", "fix": "bug", "docs": "documentation", "ci": "CI/CD", "perf": "performance"}'

modules/google_vm/main.tf

@@ -48,6 +48,15 @@ resource "google_compute_instance" "google_vm" {
     }
   }
 
+  # Lifecycle settings for the resource
+  lifecycle {
+    ignore_changes = [
+      # Ignore changes to boot disk, as it could cause
+      # the VM to be recreated if the image is updated.
+      boot_disk,
+    ]
+  }
+
   allow_stopping_for_update = true
 }
 

modules/google_vm/variables.tf

@@ -65,7 +65,7 @@ variable "ssh_public_key" {
 variable "os_image" {
   description = "OS Image to configure the VM with"
   type        = string
-  default     = "ubuntu-os-cloud/ubuntu-2004-lts" # FAMILY/PROJECT glcoud compute images list
+  default     = "ubuntu-os-cloud/ubuntu-2404-lts-amd64" # FAMILY/PROJECT glcoud compute images list
 }
 
 

test/helpers/helper_test.go

@@ -4,11 +4,12 @@
 package helpers
 
 import (
+	"testing"
+
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
 	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2020-10-01/resources"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 // TestRetrieveFromStruct tests the RetrieveFromStruct function, ensuring that values are correctly retrieved and
@@ -66,7 +67,7 @@ func TestRetrieveFromStruct(t *testing.T) {
 				ImageReference: &compute.ImageReference{
 					Offer:     to.StringPtr("0001-com-ubuntu-server-focal"),
 					Publisher: to.StringPtr("Canonical"),
-					Sku:       to.StringPtr("20_04-lts"),
+					Sku:       to.StringPtr("24_04-lts-amd64"),
 					Version:   to.StringPtr("latest"),
 				},
 			},
@@ -110,7 +111,7 @@ func TestRetrieveFromStruct(t *testing.T) {
 	publisher := RetrieveFromStruct(nfsVM, "VirtualMachineProperties", "StorageProfile", "ImageReference", "Publisher")()
 	assert.Equal(t, "Canonical", publisher)
 	sku := RetrieveFromStruct(nfsVM, "VirtualMachineProperties", "StorageProfile", "ImageReference", "Sku")()
-	assert.Equal(t, "20_04-lts", sku)
+	assert.Equal(t, "24_04-lts-amd64", sku)
 	version := RetrieveFromStruct(nfsVM, "VirtualMachineProperties", "StorageProfile", "ImageReference", "Version")()
 	assert.Equal(t, "latest", version)
 }

vms.tf

@@ -29,7 +29,7 @@ module "nfs_server" {
   tags         = var.tags
 
   subnet   = local.subnet_names["misc"] // Name or self_link to subnet
-  os_image = "ubuntu-os-cloud/ubuntu-2004-lts"
+  os_image = "ubuntu-os-cloud/ubuntu-2404-lts-amd64"
 
   vm_admin       = var.nfs_vm_admin
   ssh_public_key = local.ssh_public_key
@@ -60,7 +60,7 @@ module "jump_server" {
   tags         = var.tags
 
   subnet   = local.subnet_names["misc"] // Name or self_link to subnet
-  os_image = "ubuntu-os-cloud/ubuntu-2004-lts"
+  os_image = "ubuntu-os-cloud/ubuntu-2404-lts-amd64"
 
   vm_admin       = var.jump_vm_admin
   ssh_public_key = local.ssh_public_key