Skip to content

Commit 54746ca

Browse files
modular-magicianmodular-magician
authored
Update uses of ubuntu-2004-lts to 2204-lts (#14273) (#23266)
[upstream:62f18b61423b85268b4f7206dff47a136510a355] Signed-off-by: Modular Magician <[email protected]>
1 parent bef479a commit 54746ca

6 files changed

+21
-21
lines changed

‎google/services/compute/resource_compute_instance_from_template_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ resource "google_compute_instance_from_template" "inst" {
12411241
func testAccComputeInstanceFromTemplate_confidentialInstanceConfigEnable(templateDisk string, image string, template string, instance string, template2 string, instance2 string, confidentialInstanceType string) string {
12421242
return fmt.Sprintf(`
12431243
data "google_compute_image" "my_image1" {
1244-
family = "ubuntu-2004-lts"
1244+
family = "ubuntu-2204-lts"
12451245
project = "ubuntu-os-cloud"
12461246
}
12471247
@@ -1334,7 +1334,7 @@ resource "google_compute_instance_from_template" "inst2" {
13341334
func testAccComputeInstanceFromTemplate_confidentialInstanceConfigNoConfigSevSnp(templateDisk string, image string, template string, instance string, template2 string, instance2 string, confidentialInstanceType string) string {
13351335
return fmt.Sprintf(`
13361336
data "google_compute_image" "my_image1" {
1337-
family = "ubuntu-2004-lts"
1337+
family = "ubuntu-2204-lts"
13381338
project = "ubuntu-os-cloud"
13391339
}
13401340

‎google/services/compute/resource_compute_instance_template_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3789,7 +3789,7 @@ resource "google_compute_instance_template" "foobar" {
37893789
func testAccComputeInstanceTemplateConfidentialInstanceConfigEnable(suffix string, confidentialInstanceType string) string {
37903790
return fmt.Sprintf(`
37913791
data "google_compute_image" "my_image" {
3792-
family = "ubuntu-2004-lts"
3792+
family = "ubuntu-2204-lts"
37933793
project = "ubuntu-os-cloud"
37943794
}
37953795
@@ -3847,7 +3847,7 @@ resource "google_compute_instance_template" "foobar2" {
38473847
func testAccComputeInstanceTemplateConfidentialInstanceConfigNoEnable(suffix string, minCpuPlatform, confidentialInstanceType string) string {
38483848
return fmt.Sprintf(`
38493849
data "google_compute_image" "my_image2" {
3850-
family = "ubuntu-2004-lts"
3850+
family = "ubuntu-2204-lts"
38513851
project = "ubuntu-os-cloud"
38523852
}
38533853
@@ -3941,7 +3941,7 @@ resource "google_compute_instance_template" "foobar5" {
39413941
func testAccComputeInstanceTemplateAdvancedMachineFeatures(suffix string) string {
39423942
return fmt.Sprintf(`
39433943
data "google_compute_image" "my_image" {
3944-
family = "ubuntu-2004-lts"
3944+
family = "ubuntu-2204-lts"
39453945
project = "ubuntu-os-cloud"
39463946
}
39473947
@@ -3977,7 +3977,7 @@ resource "google_compute_instance_template" "foobar" {
39773977
func testAccComputeInstanceTemplate_performanceMonitoringUnit(context map[string]interface{}) string {
39783978
return acctest.Nprintf(`
39793979
data "google_compute_image" "my_image" {
3980-
family = "ubuntu-2004-lts"
3980+
family = "ubuntu-2204-lts"
39813981
project = "ubuntu-os-cloud"
39823982
}
39833983
@@ -4003,7 +4003,7 @@ resource "google_compute_instance_template" "foobar" {
40034003
func testAccComputeInstanceTemplate_enableUefiNetworking(context map[string]interface{}) string {
40044004
return acctest.Nprintf(`
40054005
data "google_compute_image" "my_image" {
4006-
family = "ubuntu-2004-lts"
4006+
family = "ubuntu-2204-lts"
40074007
project = "ubuntu-os-cloud"
40084008
}
40094009

‎google/services/compute/resource_compute_instance_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8909,7 +8909,7 @@ resource "google_compute_instance" "foobar" {
89098909
func testAccComputeInstanceConfidentialInstanceConfigEnable(instance string, confidentialInstanceType string) string {
89108910
return fmt.Sprintf(`
89118911
data "google_compute_image" "my_image" {
8912-
family = "ubuntu-2004-lts"
8912+
family = "ubuntu-2204-lts"
89138913
project = "ubuntu-os-cloud"
89148914
}
89158915
@@ -8971,7 +8971,7 @@ resource "google_compute_instance" "foobar2" {
89718971
func testAccComputeInstanceConfidentialInstanceConfigNoEnable(instance string, minCpuPlatform, confidentialInstanceType string) string {
89728972
return fmt.Sprintf(`
89738973
data "google_compute_image" "my_image2" {
8974-
family = "ubuntu-2004-lts"
8974+
family = "ubuntu-2204-lts"
89758975
project = "ubuntu-os-cloud"
89768976
}
89778977
@@ -9870,7 +9870,7 @@ resource "google_compute_instance" "foobar" {
98709870
func testAccComputeInstance_spotVM(instance string) string {
98719871
return fmt.Sprintf(`
98729872
data "google_compute_image" "my_image" {
9873-
family = "ubuntu-2004-lts"
9873+
family = "ubuntu-2204-lts"
98749874
project = "ubuntu-os-cloud"
98759875
}
98769876
@@ -9902,7 +9902,7 @@ resource "google_compute_instance" "foobar" {
99029902
func testAccComputeInstance_standardVM_maxRunDuration(instance string, instanceTerminationAction string) string {
99039903
return fmt.Sprintf(`
99049904
data "google_compute_image" "my_image" {
9905-
family = "ubuntu-2004-lts"
9905+
family = "ubuntu-2204-lts"
99069906
project = "ubuntu-os-cloud"
99079907
}
99089908
@@ -9937,7 +9937,7 @@ resource "google_compute_instance" "foobar" {
99379937
func testAccComputeInstance_standardVM_maxRunDurationUpdated(instance string, instanceTerminationAction string) string {
99389938
return fmt.Sprintf(`
99399939
data "google_compute_image" "my_image" {
9940-
family = "ubuntu-2004-lts"
9940+
family = "ubuntu-2204-lts"
99419941
project = "ubuntu-os-cloud"
99429942
}
99439943
@@ -10013,7 +10013,7 @@ resource "google_compute_instance" "foobar" {
1001310013
func testAccComputeInstance_spotVM_maxRunDuration(instance string, instanceTerminationAction string) string {
1001410014
return fmt.Sprintf(`
1001510015
data "google_compute_image" "my_image" {
10016-
family = "ubuntu-2004-lts"
10016+
family = "ubuntu-2204-lts"
1001710017
project = "ubuntu-os-cloud"
1001810018
}
1001910019
@@ -10049,7 +10049,7 @@ resource "google_compute_instance" "foobar" {
1004910049
func testAccComputeInstance_localSsdRecoveryTimeout(instance string) string {
1005010050
return fmt.Sprintf(`
1005110051
data "google_compute_image" "my_image" {
10052-
family = "ubuntu-2004-lts"
10052+
family = "ubuntu-2204-lts"
1005310053
project = "ubuntu-os-cloud"
1005410054
}
1005510055

‎google/services/compute/resource_compute_region_instance_template_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3131,7 +3131,7 @@ resource "google_compute_region_instance_template" "foobar" {
31313131
func testAccComputeRegionInstanceTemplateConfidentialInstanceConfigEnable(suffix string, confidentialInstanceType string) string {
31323132
return fmt.Sprintf(`
31333133
data "google_compute_image" "my_image" {
3134-
family = "ubuntu-2004-lts"
3134+
family = "ubuntu-2204-lts"
31353135
project = "ubuntu-os-cloud"
31363136
}
31373137
@@ -3191,7 +3191,7 @@ resource "google_compute_region_instance_template" "foobar2" {
31913191
func testAccComputeRegionInstanceTemplateConfidentialInstanceConfigNoEnable(suffix string, minCpuPlatform, confidentialInstanceType string) string {
31923192
return fmt.Sprintf(`
31933193
data "google_compute_image" "my_image2" {
3194-
family = "ubuntu-2004-lts"
3194+
family = "ubuntu-2204-lts"
31953195
project = "ubuntu-os-cloud"
31963196
}
31973197
@@ -3288,7 +3288,7 @@ resource "google_compute_region_instance_template" "foobar5" {
32883288
func testAccComputeRegionInstanceTemplateAdvancedMachineFeatures(suffix string) string {
32893289
return fmt.Sprintf(`
32903290
data "google_compute_image" "my_image" {
3291-
family = "ubuntu-2004-lts"
3291+
family = "ubuntu-2204-lts"
32923292
project = "ubuntu-os-cloud"
32933293
}
32943294
@@ -3325,7 +3325,7 @@ resource "google_compute_region_instance_template" "foobar" {
33253325
func testAccComputeRegionInstanceTemplate_performanceMonitoringUnit(context map[string]interface{}) string {
33263326
return acctest.Nprintf(`
33273327
data "google_compute_image" "my_image" {
3328-
family = "ubuntu-2004-lts"
3328+
family = "ubuntu-2204-lts"
33293329
project = "ubuntu-os-cloud"
33303330
}
33313331
@@ -3352,7 +3352,7 @@ resource "google_compute_region_instance_template" "foobar" {
33523352
func testAccComputeRegionInstanceTemplate_enableUefiNetworking(context map[string]interface{}) string {
33533353
return acctest.Nprintf(`
33543354
data "google_compute_image" "my_image" {
3355-
family = "ubuntu-2004-lts"
3355+
family = "ubuntu-2204-lts"
33563356
project = "ubuntu-os-cloud"
33573357
}
33583358

‎website/docs/r/compute_instance.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ resource "google_compute_instance" "confidential_instance" {
9999
100100
boot_disk {
101101
initialize_params {
102-
image = "ubuntu-os-cloud/ubuntu-2004-lts"
102+
image = "ubuntu-os-cloud/ubuntu-2204-lts"
103103
labels = {
104104
my_label = "value"
105105
}

‎website/docs/r/compute_instance_template.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ resource "google_compute_instance_template" "confidential_instance_template" {
260260
}
261261
262262
disk {
263-
source_image = "ubuntu-os-cloud/ubuntu-2004-lts"
263+
source_image = "ubuntu-os-cloud/ubuntu-2204-lts"
264264
}
265265
266266
network_interface {

0 commit comments

Comments
 (0)