Merge pull request #56497 from rphillips/fixes/fix_disk_metrics_coreos

Automatic merge from submit-queue (batch tested with PRs 56497, 56500, 55018, 56544, 56425). 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>. e2e: eviction test redirect dd stderr **What this PR does / why we need it**: Redirects `dd` stderr to /dev/null **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #56234 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #56497 from rphillips/fixes/fix_disk_metrics_coreos
f9c93154 · Kubernetes Submit Queue · GitHub · a8a5d44a · 769b9eed · f9c93154
Unverified Commit f9c93154 authored Nov 29, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

eviction_test.go test/e2e_node/eviction_test.go +1 -1

No files found.
--- a/test/e2e_node/eviction_test.go
+++ b/test/e2e_node/eviction_test.go
@@ -628,7 +628,7 @@ func inodeConsumingPod(name string, volumeSource *v1.VolumeSource) *v1.Pod {

 func diskConsumingPod(name string, diskConsumedMB int, volumeSource *v1.VolumeSource, resources v1.ResourceRequirements) *v1.Pod {
 	// Each iteration writes 1 Mb, so do diskConsumedMB iterations.
-	return podWithCommand(volumeSource, resources, name, fmt.Sprintf("i=0; while [ $i -lt %d ];", diskConsumedMB)+" do dd if=/dev/urandom of=%s${i} bs=1048576 count=1; i=$(($i+1)); done; while true; do sleep 5; done")
+	return podWithCommand(volumeSource, resources, name, fmt.Sprintf("i=0; while [ $i -lt %d ];", diskConsumedMB)+" do dd if=/dev/urandom of=%s${i} bs=1048576 count=1 2>/dev/null ; i=$(($i+1)); done; while true; do sleep 5; done")
 }

 // podWithCommand returns a pod with the provided volumeSource and resourceRequirements.