Merge pull request kubernetes#129251 from alingse/patch-1

k8s-ci-robot · web-flow · commit f06716edb11d · 2025-02-26T18:48:30.000-08:00
fix check errRaw != nil but return a nil value error err
diff --git a/test/e2e/framework/kubelet/stats.go b/test/e2e/framework/kubelet/stats.go
@@ -325,7 +325,7 @@ func GetKubeletHeapStats(ctx context.Context, c clientset.Interface, nodeName st
 	}
 	raw, errRaw := client.Raw()
 	if errRaw != nil {
-		return "", err
+		return "", errRaw
 	}
 	kubeletstatsv1alpha1 := string(raw)
 	// Only dumping the runtime.MemStats numbers to avoid polluting the log.

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ func GetKubeletHeapStats(ctx context.Context, c clientset.Interface, nodeName st`
`325`	`325`	`}`
`326`	`326`	`raw, errRaw := client.Raw()`
`327`	`327`	`if errRaw != nil {`
`328`		`- return "", err`
	`328`	`+ return "", errRaw`
`329`	`329`	`}`
`330`	`330`	`kubeletstatsv1alpha1 := string(raw)`
`331`	`331`	`// Only dumping the runtime.MemStats numbers to avoid polluting the log.`