Merge pull request #18417 from sjenning/pick-59279

Automatic merge from submit-queue. UPSTREAM: 59279: nodelifecycle: set OutOfDisk unknown on node timeout kubernetes/kubernetes#59279 xref https://bugzilla.redhat.com/show_bug.cgi?id=1541263 @derekwaynecarr @wjiangjay
openshift · Feb 9, 2018 · ae63a98 · ae63a98
2 parents f4e5a60 + b0aa4a1
commit ae63a98
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/node/node_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/node/node_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/node/nodecontroller_test.go b/vendor/k8s.io/kubernetes/pkg/controller/node/nodecontroller_test.go