Skip to content

Commit d1d6f64

Browse files
authored
Merge pull request kubernetes#78198 from Random-Liu/node-e2e-service-account
Use default service account when creating test instance.
2 parents 585fa3a + cd33337 commit d1d6f64

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

test/e2e_node/runner/remote/run_remote.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,13 @@ func testImage(imageConfig *internalGCEImage, junitFilePrefix string) *TestResul
558558

559559
// Provision a gce instance using image
560560
func createInstance(imageConfig *internalGCEImage) (string, error) {
561-
klog.V(1).Infof("Creating instance %+v", *imageConfig)
561+
p, err := computeService.Projects.Get(*project).Do()
562+
if err != nil {
563+
return "", fmt.Errorf("failed to get project info %q", *project)
564+
}
565+
// Use default service account
566+
serviceAccount := p.DefaultServiceAccount
567+
klog.V(1).Infof("Creating instance %+v with service account %q", *imageConfig, serviceAccount)
562568
name := imageToInstanceName(imageConfig)
563569
i := &compute.Instance{
564570
Name: name,
@@ -583,6 +589,14 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
583589
},
584590
},
585591
},
592+
ServiceAccounts: []*compute.ServiceAccount{
593+
{
594+
Email: serviceAccount,
595+
Scopes: []string{
596+
"https://www.googleapis.com/auth/cloud-platform",
597+
},
598+
},
599+
},
586600
}
587601

588602
for _, accelerator := range imageConfig.resources.Accelerators {
@@ -602,7 +616,6 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
602616
i.GuestAccelerators = append(i.GuestAccelerators, ac)
603617
}
604618

605-
var err error
606619
i.Metadata = imageConfig.metadata
607620
if _, err := computeService.Instances.Get(*project, *zone, i.Name).Do(); err != nil {
608621
op, err := computeService.Instances.Insert(*project, *zone, i).Do()

0 commit comments

Comments
 (0)