github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #52905 from aleksandra-malinowska/autoscaling-fix-7 

Automatic merge from submit-queue (batch tested with PRs 52905, 52766). 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>..

Refactor parsing cluster autoscaler status, add logging error

Minor improvements to autoscaling test suite and e2e framework.
pull/6/head
Kubernetes Submit Queue 2017-09-25 04:02:51 -07:00 committed by GitHub
parent e5fb3d7108 88da2c1c70
commit cb6f62d92f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/autoscaling/cluster_size_autoscaling.go
View File

@ -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
}

2
test/e2e/framework/util.go
View File

@ -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 {