Merge pull request #67641 from mborsz/preparenodes

Automatic merge from submit-queue (batch tested with PRs 66229, 67682, 67585, 67641, 67697). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix validation logic in E2ETestNodePreparer. **What this PR does / why we need it**: There is a bug in E2ETestNodePreparer validation logic. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #67641 from mborsz/preparenodes
7b2fa0a2 · Kubernetes Submit Queue · GitHub · 408ddbc2 · 339e2f47 · 7b2fa0a2
Unverified Commit 7b2fa0a2 authored Aug 22, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

util.go test/e2e/framework/util.go +2 -2

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -4876,8 +4876,8 @@ func NewE2ETestNodePreparer(client clientset.Interface, countToStrategy []testut
 func (p *E2ETestNodePreparer) PrepareNodes() error {
 	nodes := GetReadySchedulableNodesOrDie(p.client)
 	numTemplates := 0
-	for k := range p.countToStrategy {
-		numTemplates += k
+	for _, v := range p.countToStrategy {
+		numTemplates += v.Count
 	}
 	if numTemplates > len(nodes.Items) {
 		return fmt.Errorf("Can't prepare Nodes. Got more templates than existing Nodes.")