Merge pull request #50831 from Random-Liu/instance-metadata-from-flag

Automatic merge from submit-queue (batch tested with PRs 50693, 50831, 47506, 49119, 50871) Add instance metadata from flag even when using image config. Also add instance metadata from flag even when we are using image config. * Sometimes we need to dynamically generate instance metadata, it's troublesome to put them into image config. * Sometimes we want to apply instance metadata to all images, it's duplicated to add them to each image in the image config. /assign @yguo0905 Could you help me review this?

Merge pull request #50831 from Random-Liu/instance-metadata-from-flag
0867802b · Kubernetes Submit Queue · GitHub · aa31d193 · 2c129e4d · 0867802b
Commit 0867802b authored Aug 21, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

run_remote.go test/e2e_node/runner/remote/run_remote.go +5 -1

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