Merge pull request #45901 from Random-Liu/fix-node-e2e

Automatic merge from submit-queue (batch tested with PRs 44520, 45253, 45838, 44685, 45901) Fix node e2e panic when not using image config file. In https://github.com/kubernetes/kubernetes/pull/45430, `resources` field in image config is a pointer, and we only initialize it when using image config file. However, we still have test specifying images directly without image config file, this will cause those test to panic. See: * https://k8s-testgrid.appspot.com/google-docker#kubelet * https://k8s-testgrid.appspot.com/google-docker#e2e-cos This PR fixes this. @vishh @mtaufen @kewu1992

Merge pull request #45901 from Random-Liu/fix-node-e2e
23f0fe86 · Kubernetes Submit Queue · GitHub · 6f4e0b66 · 56803ec9 · 23f0fe86
Commit 23f0fe86 authored May 16, 2017 by Kubernetes Submit Queue Committed by GitHub May 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

run_remote.go test/e2e_node/runner/remote/run_remote.go +2 -2

No files found.
--- a/test/e2e_node/runner/remote/run_remote.go
+++ b/test/e2e_node/runner/remote/run_remote.go
@@ -132,7 +132,7 @@ type internalImageConfig struct {
 type internalGCEImage struct {
 	image     string
 	project   string
-	resources *Resources
+	resources Resources
 	metadata  *compute.Metadata
 	machine   string
 	tests     []string
@@ -209,7 +209,7 @@ func main() {
 					metadata:  getImageMetadata(imageConfig.Metadata),
 					machine:   imageConfig.Machine,
 					tests:     imageConfig.Tests,
-					resources: &imageConfig.Resources,
+					resources: imageConfig.Resources,
 				}
 				if isRegex && len(images) > 1 {
 					// Use image name when shortName is not unique.