github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add instance metadata from flag even when using image config.

Browse Source
This commit is contained in:
Random-Liu 2017-08-16 23:15:11 -07:00
parent baa6b2ff20
commit 2c129e4d6a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e_node/runner/remote/run_remote.go
View File

@ -208,11 +208,15 @@ func main() {
images = []string{imageConfig.Image} images = []string{imageConfig.Image}
} }
for _, image := range images { for _, image := range images {
metadata := imageConfig.Metadata
if len(strings.TrimSpace(*instanceMetadata)) > 0 {
metadata += "," + *instanceMetadata
}
gceImage := internalGCEImage{ gceImage := internalGCEImage{
image: image, image: image,
imageDesc: imageConfig.ImageDesc, imageDesc: imageConfig.ImageDesc,
project: imageConfig.Project, project: imageConfig.Project,
metadata: getImageMetadata(imageConfig.Metadata), metadata: getImageMetadata(metadata),
machine: imageConfig.Machine, machine: imageConfig.Machine,
tests: imageConfig.Tests, tests: imageConfig.Tests,
resources: imageConfig.Resources, resources: imageConfig.Resources,