mirror of https://github.com/k3s-io/k3s
refactor parsing cluster autoscaler status
parent
04673ab614
commit
88da2c1c70
|
@ -1365,12 +1365,12 @@ func getStatusTimestamp(status string) (time.Time, error) {
|
|||
return time.Time{}, err
|
||||
}
|
||||
|
||||
timestampMatches := timestampMatcher.FindAllStringSubmatch(status, -1)
|
||||
if len(timestampMatches) < 1 {
|
||||
timestampMatch := timestampMatcher.FindStringSubmatch(status)
|
||||
if len(timestampMatch) < 2 {
|
||||
return time.Time{}, fmt.Errorf("Failed to parse CA status timestamp, raw status: %v", status)
|
||||
}
|
||||
|
||||
timestamp, err := time.Parse(timestampFormat, timestampMatches[0][1])
|
||||
timestamp, err := time.Parse(timestampFormat, timestampMatch[1])
|
||||
if err != nil {
|
||||
return time.Time{}, err
|
||||
}
|
||||
|
|
|
@ -2351,7 +2351,7 @@ func DumpNodeDebugInfo(c clientset.Interface, nodeNames []string, logFunc func(f
|
|||
logFunc("\nLogging pods the kubelet thinks is on node %v", n)
|
||||
podList, err := GetKubeletPods(c, n)
|
||||
if err != nil {
|
||||
logFunc("Unable to retrieve kubelet pods for node %v", n)
|
||||
logFunc("Unable to retrieve kubelet pods for node %v: %v", n, err)
|
||||
continue
|
||||
}
|
||||
for _, p := range podList.Items {
|
||||
|
|
Loading…
Reference in New Issue