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.

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

Updated Ubuntu Image reference to the newly available images and fixed a deprecated parameter #341

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions quickstart/101-vm-cluster-linux/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ resource "azurerm_linux_virtual_machine" "test" {

source_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resource "random_string" "ci_prefix" {
length = 8
upper = false
special = false
number = false
numeric = false
}

# Compute instance
Expand Down
10 changes: 5 additions & 5 deletions quickstart/201-vmss-jumpbox/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resource "random_string" "fqdn" {
length = 6
special = false
upper = false
number = false
numeric = false
}

resource "azurerm_virtual_network" "vmss" {
Expand Down Expand Up @@ -105,8 +105,8 @@ resource "azurerm_virtual_machine_scale_set" "vmss" {

storage_profile_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down Expand Up @@ -183,8 +183,8 @@ resource "azurerm_virtual_machine" "jumpbox" {

storage_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down
4 changes: 2 additions & 2 deletions quickstart/201-vmss-packer-jumpbox/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ resource "azurerm_virtual_machine" "jumpbox" {

storage_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down
6 changes: 3 additions & 3 deletions quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ variable "image_resource_group_name" {
source "azure-arm" "builder" {
client_id = var.client_id
client_secret = var.client_secret
image_offer = "UbuntuServer"
image_publisher = "canonical"
image_sku = "16.04-LTS"
image_offer = "ubuntu-24_04-lts"
image_publisher = "Canonical"
image_sku = "server-gen1"
location = var.location
managed_image_name = "myPackerImage"
managed_image_resource_group_name = var.image_resource_group_name
Expand Down
4 changes: 2 additions & 2 deletions quickstart/301-hub-spoke/hub-nva.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ resource "azurerm_virtual_machine" "hub-nva-vm" {

storage_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down
4 changes: 2 additions & 2 deletions quickstart/301-hub-spoke/hub-vnet.tf
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ resource "azurerm_virtual_machine" "hub-vm" {

storage_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down
4 changes: 2 additions & 2 deletions quickstart/301-hub-spoke/on-prem.tf
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ resource "azurerm_virtual_machine" "onprem-vm" {

storage_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down
4 changes: 2 additions & 2 deletions quickstart/301-hub-spoke/spoke1.tf
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ resource "azurerm_virtual_machine" "spoke1-vm" {

storage_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down
4 changes: 2 additions & 2 deletions quickstart/301-hub-spoke/spoke2.tf
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ resource "azurerm_virtual_machine" "spoke2-vm" {

storage_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resource "random_string" "fw_diag_prefix" {
length = 8
upper = false
special = false
number = false
numeric = false
}
resource "azurerm_ip_group" "ip_group_hub" {
name = "hub-ipgroup"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resource "random_string" "ci_prefix" {
length = 8
upper = false
special = false
number = false
numeric = false
}

# Compute instance
Expand Down
8 changes: 4 additions & 4 deletions samples/end-to-end-testing/src/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ resource "azurerm_linux_virtual_machine" "vm1" {

source_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "18.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}
}
Expand Down Expand Up @@ -133,8 +133,8 @@ resource "azurerm_linux_virtual_machine" "vm2" {

source_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "18.04-LTS"
offer = "ubuntu-24_04-lts"
sku = "server-gen1"
version = "latest"
}
}
4 changes: 2 additions & 2 deletions solution_template/vm-linux-terraform/mainTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@
"storageProfile": {
"imageReference": {
"publisher": "Canonical",
"offer": "UbuntuServer",
"sku": "16.04-LTS",
"offer": "ubuntu-24_04-lts",
"sku": "server-gen1",
"version": "latest"
},
"osDisk": {
Expand Down