Commit 2c129e4d authored by Random-Liu's avatar Random-Liu

Add instance metadata from flag even when using image config.

parent baa6b2ff
...@@ -208,11 +208,15 @@ func main() { ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment