Merge pull request #67585 from mborsz/getmaster

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>. Don't ignore error in GetMasterAndWorkerNodesOrDie. **What this PR does / why we need it**: In https://github.com/kubernetes/kubernetes/issues/67584 I'm seeing that method to be failing. Without any error message, it's not possible to debug what is happening there. Although this method has 'OrDie' in name, it ignores an error and never dies. **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 #67585 from mborsz/getmaster
408ddbc2 · Kubernetes Submit Queue · GitHub · 4e19d682 · 05707380 · 408ddbc2
Unverified Commit 408ddbc2 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 1 deletion

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

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -4831,7 +4831,8 @@ func WaitForStableCluster(c clientset.Interface, masterNodes sets.String) int {
 func GetMasterAndWorkerNodesOrDie(c clientset.Interface) (sets.String, *v1.NodeList) {
 	nodes := &v1.NodeList{}
 	masters := sets.NewString()
-	all, _ := c.CoreV1().Nodes().List(metav1.ListOptions{})
+	all, err := c.CoreV1().Nodes().List(metav1.ListOptions{})
+	ExpectNoError(err)
 	for _, n := range all.Items {
 		if system.IsMasterNode(n.Name) {
 			masters.Insert(n.Name)