Merge pull request kubernetes#88104 from sshukun/fix-impossible-condition

k8s-ci-robot · web-flow · commit 97dbf3a84464 · 2020-02-13T14:14:27.000-08:00
Fix impossible condition in test/e2e/framework/resource_usage_gatherer.go
diff --git a/test/e2e/framework/resource_usage_gatherer.go b/test/e2e/framework/resource_usage_gatherer.go
@@ -185,7 +185,7 @@ func (w *resourceGatherWorker) singleProbe() {
 	data := make(ResourceUsagePerContainer)
 	if w.inKubemark {
 		kubemarkData := getKubemarkMasterComponentsResourceUsage()
-		if data == nil {
+		if kubemarkData == nil {
 			return
 		}
 		for k, v := range kubemarkData {

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func (w *resourceGatherWorker) singleProbe() {`
`185`	`185`	`data := make(ResourceUsagePerContainer)`
`186`	`186`	`if w.inKubemark {`
`187`	`187`	`kubemarkData := getKubemarkMasterComponentsResourceUsage()`
`188`		`- if data == nil {`
	`188`	`+ if kubemarkData == nil {`
`189`	`189`	`return`
`190`	`190`	`}`
`191`	`191`	`for k, v := range kubemarkData {`