Skip to content

Commit bff7b01

Browse files
author
Vincent Illiano
committed
chore(deps): update vm image to ubuntu 22.04 (PSKD-1572)
Signed-off-by: Vincent Illiano <[email protected]>
1 parent d5985fd commit bff7b01

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docs/CONFIG-VARS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ You can use `default_public_access_cidrs` to set a default range for all created
9999

100100
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).
101101

102-
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).
102+
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).
103103

104104
To accept the terms please run following az command before deploying cluster:
105105

106106
```bash
107-
az vm image terms accept --urn Canonical:0001-com-ubuntu-pro-focal-fips:pro-fips-20_04-gen2:latest --subscription $subscription_id
107+
az vm image terms accept --urn Canonical:0001-com-ubuntu-pro-focal-fips:pro-fips-22_04-gen2:latest --subscription $subscription_id
108108
```
109109

110110
| Name | Description | Type | Default | Notes |
@@ -193,7 +193,7 @@ subnet_names = {
193193

194194
## General
195195

196-
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.
196+
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.
197197

198198
| Name | Description | Type | Default | Notes |
199199
| :--- | ---: | ---: | ---: | ---: |

modules/azurerm_vm/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ resource "azurerm_linux_virtual_machine" "vm" {
8888
source_image_reference {
8989
publisher = var.os_publisher
9090
offer = var.fips_enabled ? "0001-com-ubuntu-pro-focal-fips" : var.os_offer
91-
sku = var.fips_enabled ? "pro-fips-20_04-gen2" : var.os_sku
91+
sku = var.fips_enabled ? "pro-fips-22_04-gen2" : var.os_sku
9292
version = var.os_version
9393
}
9494

9595
dynamic "plan" {
9696
for_each = var.fips_enabled ? [1] : []
9797
content {
98-
name = "pro-fips-20_04-gen2"
98+
name = "pro-fips-22_04-gen2"
9999
publisher = "canonical"
100100
product = "0001-com-ubuntu-pro-focal-fips"
101101
}

modules/azurerm_vm/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ variable "os_offer" {
7171
variable "os_sku" {
7272
description = "Specifies the SKU of the image used to create the virtual machines. Changing this forces a new resource to be created."
7373
type = string
74-
default = "20_04-lts"
74+
default = "22_04-lts"
7575
}
7676

7777
variable "os_version" {

0 commit comments

Comments
 (0)