Merge pull request #69613 from Pingan2017/runtimeError

improve err msg for runtimeError when the uptime of runtime never update

Merge pull request #69613 from Pingan2017/runtimeError
c68ee221 · k8s-ci-robot · GitHub · 060218a8 · a5824043 · c68ee221
Unverified Commit c68ee221 authored Oct 15, 2018 by k8s-ci-robot Committed by GitHub Oct 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

runtime.go pkg/kubelet/runtime.go +3 -1

No files found.
--- a/pkg/kubelet/runtime.go
+++ b/pkg/kubelet/runtime.go
@@ -74,7 +74,9 @@ func (s *runtimeState) runtimeErrors() []string {
 	s.RLock()
 	defer s.RUnlock()
 	var ret []string
-	if !s.lastBaseRuntimeSync.Add(s.baseRuntimeSyncThreshold).After(time.Now()) {
+	if s.lastBaseRuntimeSync.IsZero() {
+		ret = append(ret, "container runtime status check may not have completed yet")
+	} else if !s.lastBaseRuntimeSync.Add(s.baseRuntimeSyncThreshold).After(time.Now()) {
 		ret = append(ret, "container runtime is down")
 	}
 	for _, hc := range s.healthChecks {