kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14436 from olemarkus/aggr-rolling-errors 

Log and aggregate errors from rolling update
This commit is contained in:
Kubernetes Prow Robot 2022-10-20 12:35:24 -07:00 committed by GitHub
parent 73b50d2913 b45968c992
commit f12335fa29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/instancegroups/rollingupdate.go
View File

@ -23,6 +23,7 @@ import (
"sync"
"time"
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/kops/pkg/client/simple"
"k8s.io/client-go/kubernetes"
@ -186,9 +187,10 @@ func (c *RollingUpdateCluster) RollingUpdate(groups map[string]*cloudinstances.C
for _, k := range sortGroups(apiServerGroups) {
err := c.rollingUpdateInstanceGroup(apiServerGroups[k], c.NodeInterval)
results[k] = err
if err != nil {
klog.Errorf("failed to roll InstanceGroup %q: %v", k, err)
}
// TODO: Bail on error?
}
}
@ -207,21 +209,23 @@ func (c *RollingUpdateCluster) RollingUpdate(groups map[string]*cloudinstances.C
for _, k := range sortGroups(nodeGroups) {
err := c.rollingUpdateInstanceGroup(nodeGroups[k], c.NodeInterval)
results[k] = err
if err != nil {
klog.Errorf("failed to roll InstanceGroup %q: %v", k, err)
}
// TODO: Bail on error?
}
}
errs := []error{}
for _, err := range results {
if err != nil {
return err
errs = append(errs, err)
}
}
klog.Infof("Rolling update completed for cluster %q!", c.ClusterName)
return nil
return errors.NewAggregate(errs)
}
func sortGroups(groupMap map[string]*cloudinstances.CloudInstanceGroup) []string {