Skip to content

Commit 7559687

Browse files
ysweyswe
authored
Enable nested virtualization by default. (#81)
1 parent 0e76fdf commit 7559687

File tree

13 files changed

+8
-30
lines changed

13 files changed

+8
-30
lines changed

‎cli_tools/gce_onestep_image_import/onestep_importer/importer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (args *OneStepImportArguments) registerFlags(flagSet *flag.FlagSet) {
211211
flagSet.BoolVar(&args.NoGuestEnvironment, "no_guest_environment", false,
212212
"When enabled, the Google Guest Environment will not be installed.")
213213

214-
flagSet.BoolVar(&args.NestedVirtualizationEnabled, "enable_nested_virtualization", false,
214+
flagSet.BoolVar(&args.NestedVirtualizationEnabled, "enable_nested_virtualization", true,
215215
"When enabled, temporary worker VMs will be created with enabled nested virtualization. "+
216216
"See https://cloud.google.com/compute/docs/instances/nested-virtualization/enabling for details.")
217217

‎cli_tools/gce_ovf_export/domain/args.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,6 @@ func (args *OVFExportArgs) registerFlags(cliArgs []string) error {
228228
flagSet.Var((*flags.TrimmedString)(&args.BuildID), "build-id",
229229
"Cloud Build ID override. This flag should be used if auto-generated or build ID provided by Cloud Build is not appropriate. For example, if running multiple exports in parallel in a single Cloud Build run, sharing build ID could cause premature temporary resource clean-up resulting in export failures.")
230230
flagSet.Var((*flags.TrimmedString)(&args.ComputeServiceAccount), "compute-service-account", "Compute service account to be used by exporter Virtual Machine. When empty, the Compute Engine default service account is used.")
231-
flagSet.BoolVar(&args.NestedVirtualizationEnabled, "enable-nested-virtualization", false, "When enabled, temporary worker VMs will be created with enabled nested virtualization. See https://cloud.google.com/compute/docs/instances/nested-virtualization/enabling for details.")
231+
flagSet.BoolVar(&args.NestedVirtualizationEnabled, "enable-nested-virtualization", true, "When enabled, temporary worker VMs will be created with enabled nested virtualization. See https://cloud.google.com/compute/docs/instances/nested-virtualization/enabling for details.")
232232
return flagSet.Parse(cliArgs)
233233
}

‎cli_tools/gce_ovf_import/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ var (
7878
hostname = flag.String(ovfimporter.HostnameFlagKey, "", "Specify the hostname of the instance to be created. The specified hostname must be RFC1035 compliant.")
7979
machineImageStorageLocation = flag.String(ovfimporter.MachineImageStorageLocationFlagKey, "", "GCS bucket storage location of the machine image being imported (regional or multi-regional)")
8080
buildID = flag.String("build-id", "", "Cloud Build ID override. This flag should be used if auto-generated or build ID provided by Cloud Build is not appropriate. For example, if running multiple imports in parallel in a single Cloud Build run, sharing build ID could cause premature temporary resource clean-up resulting in import failures.")
81-
nestedVirtualizationEnabled = flag.Bool(ovfimporter.EnableNestedVirtualizationFlagKey, false, "When enabled, temporary worker VMs will be created with enabled nested virtualization. See https://cloud.google.com/compute/docs/instances/nested-virtualization/enabling for details.")
81+
nestedVirtualizationEnabled = flag.Bool(ovfimporter.EnableNestedVirtualizationFlagKey, true, "When enabled, temporary worker VMs will be created with enabled nested virtualization. See https://cloud.google.com/compute/docs/instances/nested-virtualization/enabling for details.")
8282
nodeAffinityLabelsFlag flags.StringArrayFlag
8383
currentExecutablePath string
8484
)

‎cli_tools/gce_vm_image_export/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var (
4646
cloudLogsDisabled = flag.Bool("disable_cloud_logging", false, "do not stream logs to Cloud Logging.")
4747
stdoutLogsDisabled = flag.Bool("disable_stdout_logging", false, "do not display individual workflow logs on stdout.")
4848
labels = flag.String("labels", "", "List of label KEY=VALUE pairs to add. Keys must start with a lowercase character and contain only hyphens (-), underscores (_), lowercase characters, and numbers. Values must contain only hyphens (-), underscores (_), lowercase characters, and numbers.")
49-
nestedVirtualizationEnabled = flag.Bool("enable_nested_virtualization", false, "When enabled, temporary worker VMs will be created with enabled nested virtualization. See https://cloud.google.com/compute/docs/instances/nested-virtualization/enabling for details.")
49+
nestedVirtualizationEnabled = flag.Bool("enable_nested_virtualization", true, "When enabled, temporary worker VMs will be created with enabled nested virtualization. See https://cloud.google.com/compute/docs/instances/nested-virtualization/enabling for details.")
5050
)
5151

5252
func exportEntry() (service.Loggable, error) {

‎cli_tools/gce_vm_image_import/cli/args.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func (args *imageImportArgs) registerFlags(flagSet *flag.FlagSet) {
190190
flagSet.BoolVar(&args.NoGuestEnvironment, "no_guest_environment", false,
191191
"When enabled, the Google Guest Environment will not be installed.")
192192

193-
flagSet.BoolVar(&args.NestedVirtualizationEnabled, "enable_nested_virtualization", false,
193+
flagSet.BoolVar(&args.NestedVirtualizationEnabled, "enable_nested_virtualization", true,
194194
"When enabled, temporary worker VMs will be created with enabled nested virtualization. "+
195195
"See https://cloud.google.com/compute/docs/instances/nested-virtualization/enabling for details.")
196196

‎cli_tools/gce_vm_image_import/cli/args_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ func Test_populateAndValidate_StandardizesScratchBucketPath(t *testing.T) {
385385
}
386386

387387
func Test_populateAndValidate_NestedVirtualization(t *testing.T) {
388-
assert.False(t, parseAndPopulate(t).NestedVirtualizationEnabled)
389-
assert.True(t, parseAndPopulate(t, "-enable_nested_virtualization").NestedVirtualizationEnabled)
388+
assert.True(t, parseAndPopulate(t).NestedVirtualizationEnabled)
389+
assert.False(t, parseAndPopulate(t, "-enable_nested_virtualization=false").NestedVirtualizationEnabled)
390390
}
391391

392392
// fields here will override what's passed to PopulateMissingParameters

‎cli_tools_tests/e2e/gce_image_import_export/test_suites/export/image_export_test_suite.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ func runImageExportRawTest(ctx context.Context, testCase *junitxml.TestCase, log
100100
e2e.Wrapper: {"-client_id=e2e", fmt.Sprintf("-project=%v", testProjectConfig.TestProjectID),
101101
"-source_image=global/images/e2e-test-image-10g-eu", fmt.Sprintf("-destination_uri=%v", fileURI),
102102
fmt.Sprintf("-zone=%v", zone),
103-
"-enable_nested_virtualization",
104103
},
105104
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "export", "--quiet",
106105
"--docker-image-tag=latest", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID), "--image=e2e-test-image-10g-eu",
@@ -132,7 +131,6 @@ func runImageExportVMDKTest(ctx context.Context, testCase *junitxml.TestCase, lo
132131
e2e.Wrapper: {"-client_id=e2e", fmt.Sprintf("-project=%v", testProjectConfig.TestProjectID),
133132
"-source_image=global/images/e2e-test-image-10g-asia", fmt.Sprintf("-destination_uri=%v", fileURI), "-format=vmdk",
134133
fmt.Sprintf("-zone=%v", zone),
135-
"-enable_nested_virtualization",
136134
},
137135
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "export", "--quiet",
138136
"--docker-image-tag=latest", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID), "--image=e2e-test-image-10g-asia",
@@ -169,7 +167,6 @@ func runImageExportWithRichParamsTest(ctx context.Context, testCase *junitxml.Te
169167
fmt.Sprintf("-zone=%v", zone),
170168
"-timeout=2h", "-disable_gcs_logging", "-disable_cloud_logging", "-disable_stdout_logging",
171169
"-labels=key1=value1,key2=value",
172-
"-enable_nested_virtualization",
173170
},
174171
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "export", "--quiet",
175172
"--docker-image-tag=latest", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID),
@@ -214,7 +211,6 @@ func runImageExportWithDifferentNetworkParamStyles(ctx context.Context, testCase
214211
testProjectConfig.TestProjectID, region, testProjectConfig.TestProjectID),
215212
"-source_image=global/images/e2e-test-image-10g", fmt.Sprintf("-destination_uri=%v", fileURI),
216213
fmt.Sprintf("-zone=%v", zone),
217-
"-enable_nested_virtualization",
218214
},
219215
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "export", "--quiet",
220216
"--docker-image-tag=latest", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID),
@@ -261,7 +257,6 @@ func runImageExportWithSubnetWithoutNetworkParamsTest(ctx context.Context, testC
261257
testProjectConfig.TestProjectID, region, testProjectConfig.TestProjectID),
262258
"-source_image=global/images/e2e-test-image-10g", fmt.Sprintf("-destination_uri=%v", fileURI),
263259
fmt.Sprintf("-zone=%v", zone),
264-
"-enable_nested_virtualization",
265260
},
266261
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "export", "--quiet",
267262
"--docker-image-tag=latest", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID),
@@ -309,7 +304,6 @@ func runImageExportRawWithoutDefaultServiceAccountTest(ctx context.Context, test
309304
fmt.Sprintf("-destination_uri=%v", fileURI),
310305
fmt.Sprintf("-zone=%v", testProjectConfig.TestZone),
311306
fmt.Sprintf("-compute_service_account=%v", testVariables.ComputeServiceAccount),
312-
"-enable_nested_virtualization",
313307
},
314308
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "export", "--quiet",
315309
"--docker-image-tag=latest", fmt.Sprintf("--project=%v", testVariables.ProjectID),
@@ -354,7 +348,6 @@ func runImageExportVMDKDefaultServiceAccountWithMissingPermissionsTest(ctx conte
354348
fmt.Sprintf("-destination_uri=%v", fileURI), "-format=vmdk",
355349
fmt.Sprintf("-zone=%v", testProjectConfig.TestZone),
356350
fmt.Sprintf("-compute_service_account=%v", testVariables.ComputeServiceAccount),
357-
"-enable_nested_virtualization",
358351
},
359352
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "export", "--quiet",
360353
"--docker-image-tag=latest", fmt.Sprintf("--project=%v", testVariables.ProjectID),

‎cli_tools_tests/e2e/gce_image_import_export/test_suites/import/cli_tests.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ func runImageImportDataDiskTest(ctx context.Context, testCase *junitxml.TestCase
128128
fmt.Sprintf("-image_name=%s", imageName), "-data_disk",
129129
fmt.Sprintf("-source_file=%v", sourceFile),
130130
fmt.Sprintf("-zone=%v", zone),
131-
"-enable_nested_virtualization",
132131
},
133132
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
134133
"--docker-image-tag=latest", "--data-disk", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID),
@@ -163,7 +162,6 @@ func runImageImportOSTest(ctx context.Context, testCase *junitxml.TestCase, logg
163162
fmt.Sprintf("-image_name=%v", imageName), "-os=debian-9",
164163
fmt.Sprintf("-source_file=%v", sourceFile),
165164
fmt.Sprintf("-zone=%v", zone),
166-
"-enable_nested_virtualization",
167165
},
168166
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
169167
"--docker-image-tag=latest", "--os=debian-9", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID),
@@ -196,7 +194,6 @@ func runImageImportOSFromImageTest(ctx context.Context, testCase *junitxml.TestC
196194
e2e.Wrapper: {"-client_id=e2e", fmt.Sprintf("-project=%v", testProjectConfig.TestProjectID),
197195
fmt.Sprintf("-image_name=%v", imageName), "-os=debian-9", "-source_image=e2e-test-image-10g-eu",
198196
fmt.Sprintf("-zone=%v", zone),
199-
"-enable_nested_virtualization",
200197
},
201198
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
202199
"--docker-image-tag=latest", "--os=debian-9", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID),
@@ -239,7 +236,6 @@ func runImageImportWithRichParamsTest(ctx context.Context, testCase *junitxml.Te
239236
fmt.Sprintf("-zone=%v", testProjectConfig.TestZone),
240237
"-timeout=2h", "-disable_gcs_logging", "-disable_cloud_logging", "-disable_stdout_logging",
241238
"-no_external_ip", fmt.Sprintf("-labels=%v", strings.Join(labels, ",")),
242-
"-enable_nested_virtualization",
243239
},
244240
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
245241
"--docker-image-tag=latest", "--data-disk", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID),
@@ -286,7 +282,6 @@ func runImageImportWithDifferentNetworkParamStyles(ctx context.Context, testCase
286282
fmt.Sprintf("-subnet=projects/%v/regions/%v/subnetworks/%v-subnet-1",
287283
testProjectConfig.TestProjectID, region, testProjectConfig.TestProjectID),
288284
fmt.Sprintf("-zone=%v", testProjectConfig.TestZone),
289-
"-enable_nested_virtualization",
290285
},
291286
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
292287
"--docker-image-tag=latest", "--data-disk", fmt.Sprintf("--project=%v", testProjectConfig.TestProjectID),
@@ -334,7 +329,6 @@ func runImageImportWithSubnetWithoutNetworkSpecified(ctx context.Context, testCa
334329
fmt.Sprintf("-source_file=gs://%v-test-image/ubuntu-1804.vpc", testProjectConfig.TestProjectID),
335330
fmt.Sprintf("-subnet=%s", subnet),
336331
fmt.Sprintf("-zone=%v", zone),
337-
"-enable_nested_virtualization",
338332
},
339333
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", destinationImage, "--quiet",
340334
"--docker-image-tag=latest", fmt.Sprintf("--project=%v", project),
@@ -373,7 +367,6 @@ func runImageImportShadowDiskCleanedUpWhenMainInflaterFails(ctx context.Context,
373367
fmt.Sprintf("-network=global/networks/%v-vpc-1", testProjectConfig.TestProjectID),
374368
fmt.Sprintf("-zone=%v", testProjectConfig.TestZone),
375369
fmt.Sprintf("-execution_id=%v", suffix),
376-
"-enable_nested_virtualization",
377370
},
378371
}
379372

@@ -422,7 +415,6 @@ func runImageImportOSWithDisabledDefaultServiceAccountServiceSuccessTest(ctx con
422415
fmt.Sprintf("-source_file=%v", sourceFile),
423416
fmt.Sprintf("-zone=%v", zone),
424417
fmt.Sprintf("-compute_service_account=%v", testVariables.ComputeServiceAccount),
425-
"-enable_nested_virtualization",
426418
},
427419
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
428420
"--docker-image-tag=latest", "--os=debian-9", fmt.Sprintf("--project=%v", testVariables.ProjectID),
@@ -468,7 +460,6 @@ func runImageImportOSDefaultServiceAccountWithMissingPermissionsSuccessTest(ctx
468460
fmt.Sprintf("-source_file=%v", sourceFile),
469461
fmt.Sprintf("-zone=%v", zone),
470462
fmt.Sprintf("-compute_service_account=%v", testVariables.ComputeServiceAccount),
471-
"-enable_nested_virtualization",
472463
},
473464
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
474465
"--docker-image-tag=latest", "--os=debian-9", fmt.Sprintf("--project=%v", testVariables.ProjectID),
@@ -514,7 +505,6 @@ func runImageImportOSWithDisabledDefaultServiceAccountServiceFailTest(ctx contex
514505
fmt.Sprintf("-source_file=gs://%v-test-image/image-file-10g-vmdk", testProjectConfig.TestProjectID),
515506
fmt.Sprintf("-zone=%v", zone),
516507
fmt.Sprintf("-compute_service_account=%v", defaultAccount),
517-
"-enable_nested_virtualization",
518508
},
519509
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
520510
"--docker-image-tag=latest", "--os=debian-9", fmt.Sprintf("--project=%v", testVariables.ProjectID),
@@ -560,7 +550,6 @@ func runImageImportOSDefaultServiceAccountWithMissingPermissionsFailTest(ctx con
560550
fmt.Sprintf("-source_file=gs://%v-test-image/image-file-10g-vmdk", testProjectConfig.TestProjectID),
561551
fmt.Sprintf("-zone=%v", zone),
562552
fmt.Sprintf("-compute_service_account=%v", defaultAccount),
563-
"-enable_nested_virtualization",
564553
},
565554
e2e.GcloudBetaProdWrapperLatest: {"beta", "compute", "images", "import", imageName, "--quiet",
566555
"--docker-image-tag=latest", "--os=debian-9", fmt.Sprintf("--project=%v", testVariables.ProjectID),

‎cli_tools_tests/e2e/gce_image_import_export/test_suites/import/import_tests.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ func (t testCase) runImport(junit *junitxml.TestCase, logger *log.Logger,
483483
"-project", testProjectConfig.TestProjectID,
484484
"-zone", t.zone,
485485
"-image_name", t.imageName,
486-
"-enable_nested_virtualization",
487486
}
488487
if t.os != "" {
489488
args = append(args, "-os", t.os)

‎cli_tools_tests/e2e/gce_image_import_export/test_suites/onestep_import/onestep_import_test_suite.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ func buildTestArgs(props *onestepImportAWSTestProperties, testProjectID string,
270270
fmt.Sprintf("-aws_region=%v", awsRegion),
271271
fmt.Sprintf("-os=%v", props.os),
272272
fmt.Sprintf("-compute_service_account=%v", props.computeServiceAccount),
273-
"-enable_nested_virtualization",
274273
}
275274

276275
if props.amiID != "" {

0 commit comments

Comments
 (0)