Merge pull request #489 from sassoftware/pr-pskd-1572

chore(deps): update vm image to ubuntu 22.04 (PSKD-1572)

Author: illianov

docs/CONFIG-VARS.md

@@ -99,12 +99,12 @@ You can use `default_public_access_cidrs` to set a default range for all created
 
 The Federal Information Processing Standard (FIPS) 140 is a US government standard that defines minimum security requirements for cryptographic modules in information technology products and systems. Azure Kubernetes Service (AKS) allows the creation of node pools with FIPS 140-2 enabled. Deployments running on FIPS-enabled node pools provide increased security and help meet security controls as part of FedRAMP compliance. For more information on FIPS 140-2, see [Federal Information Processing Standard (FIPS) 140](https://learn.microsoft.com/en-us/azure/compliance/offerings/offering-fips-140-2).
 
-To enable the FIPS support in your subscription, you first need to accept the legal terms of the `Ubuntu Pro FIPS 20.04 LTS` image that will be used in the deployment. For details see [Ubuntu Pro FIPS 20.04 LTS](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/canonical.0001-com-ubuntu-pro-focal-fips?tab=Overview).
+To enable the FIPS support in your subscription, you first need to accept the legal terms of the `Ubuntu Pro FIPS 22.04 LTS` image that will be used in the deployment. For details see [Ubuntu Pro FIPS 22.04 LTS](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/canonical.0001-com-ubuntu-pro-jammy-fips?tab=Overview).
 
 To accept the terms please run following az command before deploying cluster:
 
 ```bash
-az vm image terms accept --urn Canonical:0001-com-ubuntu-pro-focal-fips:pro-fips-20_04-gen2:latest --subscription $subscription_id
+az vm image terms accept --urn Canonical:0001-com-ubuntu-pro-focal-fips:pro-fips-22_04-gen2:latest --subscription $subscription_id
 ```
 
 | Name | Description | Type | Default | Notes |
@@ -193,7 +193,7 @@ subnet_names = {
 
 ## General
 
-Ubuntu 20.04 LTS is the operating system used on the Jump/NFS servers. Ubuntu creates the `/mnt` location as an ephemeral drive that cannot be used as the root location of the `jump_rwx_filestore_path` variable.
+Ubuntu 22.04 LTS is the operating system used on the Jump/NFS servers. Ubuntu creates the `/mnt` location as an ephemeral drive that cannot be used as the root location of the `jump_rwx_filestore_path` variable.
 
 | Name | Description | Type | Default | Notes |
 | :--- | ---: | ---: | ---: | ---: |

modules/azurerm_vm/main.tf

@@ -87,17 +87,17 @@ resource "azurerm_linux_virtual_machine" "vm" {
 
   source_image_reference {
     publisher = var.os_publisher
-    offer     = var.fips_enabled ? "0001-com-ubuntu-pro-focal-fips" : var.os_offer
-    sku       = var.fips_enabled ? "pro-fips-20_04-gen2" : var.os_sku
+    offer     = var.fips_enabled ? "0001-com-ubuntu-pro-jammy-fips" : var.os_offer
+    sku       = var.fips_enabled ? "pro-fips-22_04-gen2" : var.os_sku
     version   = var.os_version
   }
 
   dynamic "plan" {
     for_each = var.fips_enabled ? [1] : []
     content {
-      name      = "pro-fips-20_04-gen2"
+      name      = "pro-fips-22_04-gen2"
       publisher = "canonical"
-      product   = "0001-com-ubuntu-pro-focal-fips"
+      product   = "0001-com-ubuntu-pro-jammy-fips"
     }
   }
 

modules/azurerm_vm/variables.tf

@@ -65,13 +65,13 @@ variable "os_publisher" {
 variable "os_offer" {
   description = "Specifies the offer of the image used to create the virtual machines. Changing this forces a new resource to be created."
   type        = string
-  default     = "0001-com-ubuntu-server-focal"
+  default     = "0001-com-ubuntu-server-jammy"
 }
 
 variable "os_sku" {
   description = "Specifies the SKU of the image used to create the virtual machines. Changing this forces a new resource to be created."
   type        = string
-  default     = "20_04-lts"
+  default     = "22_04-lts"
 }
 
 variable "os_version" {