From cd33337ad9418a98250120e71b58c2dd00a96164 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Tue, 21 May 2019 21:09:04 -0700 Subject: [PATCH] Use default service account when creating test instance. Signed-off-by: Lantao Liu --- test/e2e_node/runner/remote/run_remote.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index 407a31eaec1..770bd3c9985 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -547,7 +547,13 @@ func testImage(imageConfig *internalGCEImage, junitFilePrefix string) *TestResul // Provision a gce instance using image func createInstance(imageConfig *internalGCEImage) (string, error) { - klog.V(1).Infof("Creating instance %+v", *imageConfig) + p, err := computeService.Projects.Get(*project).Do() + if err != nil { + return "", fmt.Errorf("failed to get project info %q", *project) + } + // Use default service account + serviceAccount := p.DefaultServiceAccount + klog.V(1).Infof("Creating instance %+v with service account %q", *imageConfig, serviceAccount) name := imageToInstanceName(imageConfig) i := &compute.Instance{ Name: name, @@ -572,6 +578,14 @@ func createInstance(imageConfig *internalGCEImage) (string, error) { }, }, }, + ServiceAccounts: []*compute.ServiceAccount{ + { + Email: serviceAccount, + Scopes: []string{ + "https://www.googleapis.com/auth/cloud-platform", + }, + }, + }, } for _, accelerator := range imageConfig.resources.Accelerators { @@ -591,7 +605,6 @@ func createInstance(imageConfig *internalGCEImage) (string, error) { i.GuestAccelerators = append(i.GuestAccelerators, ac) } - var err error i.Metadata = imageConfig.metadata if _, err := computeService.Instances.Get(*project, *zone, i.Name).Do(); err != nil { op, err := computeService.Instances.Insert(*project, *zone, i).Do()