Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
d1d6f64c
Unverified
Commit
d1d6f64c
authored
May 22, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
May 22, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #78198 from Random-Liu/node-e2e-service-account
Use default service account when creating test instance.
parents
585fa3ac
cd33337a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
run_remote.go
test/e2e_node/runner/remote/run_remote.go
+15
-2
No files found.
test/e2e_node/runner/remote/run_remote.go
View file @
d1d6f64c
...
@@ -558,7 +558,13 @@ func testImage(imageConfig *internalGCEImage, junitFilePrefix string) *TestResul
...
@@ -558,7 +558,13 @@ func testImage(imageConfig *internalGCEImage, junitFilePrefix string) *TestResul
// Provision a gce instance using image
// Provision a gce instance using image
func
createInstance
(
imageConfig
*
internalGCEImage
)
(
string
,
error
)
{
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
)
name
:=
imageToInstanceName
(
imageConfig
)
i
:=
&
compute
.
Instance
{
i
:=
&
compute
.
Instance
{
Name
:
name
,
Name
:
name
,
...
@@ -583,6 +589,14 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
...
@@ -583,6 +589,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
{
for
_
,
accelerator
:=
range
imageConfig
.
resources
.
Accelerators
{
...
@@ -602,7 +616,6 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
...
@@ -602,7 +616,6 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
i
.
GuestAccelerators
=
append
(
i
.
GuestAccelerators
,
ac
)
i
.
GuestAccelerators
=
append
(
i
.
GuestAccelerators
,
ac
)
}
}
var
err
error
i
.
Metadata
=
imageConfig
.
metadata
i
.
Metadata
=
imageConfig
.
metadata
if
_
,
err
:=
computeService
.
Instances
.
Get
(
*
project
,
*
zone
,
i
.
Name
)
.
Do
();
err
!=
nil
{
if
_
,
err
:=
computeService
.
Instances
.
Get
(
*
project
,
*
zone
,
i
.
Name
)
.
Do
();
err
!=
nil
{
op
,
err
:=
computeService
.
Instances
.
Insert
(
*
project
,
*
zone
,
i
)
.
Do
()
op
,
err
:=
computeService
.
Instances
.
Insert
(
*
project
,
*
zone
,
i
)
.
Do
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment