Merge pull request #70645 from changyaowei/node_ephemeral-storage

Fix bug: when kubelet restart, the ephemeral-storage in node status upgrade to 0

Merge pull request #70645 from changyaowei/node_ephemeral-storage
af6bf1e4 · k8s-ci-robot · GitHub · 15556551 · 3f422d97 · af6bf1e4
Unverified Commit af6bf1e4 authored Nov 29, 2018 by k8s-ci-robot Committed by GitHub Nov 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

setters.go pkg/kubelet/nodestatus/setters.go +3 -1

No files found.
--- a/pkg/kubelet/nodestatus/setters.go
+++ b/pkg/kubelet/nodestatus/setters.go
@@ -270,7 +270,9 @@ func MachineInfo(nodeName string,
 				// capacity for every node status request
 				initialCapacity := capacityFunc()
 				if initialCapacity != nil {
-					node.Status.Capacity[v1.ResourceEphemeralStorage] = initialCapacity[v1.ResourceEphemeralStorage]
+					if v, exists := initialCapacity[v1.ResourceEphemeralStorage]; exists {
+						node.Status.Capacity[v1.ResourceEphemeralStorage] = v
+					}
 				}
 			}