rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-17 23:49:06 +00:00
Code Issues Releases Wiki Activity

Reset error to nil if lister works on retries

Browse Source
This commit is contained in:
rajashree
2020-03-13 14:33:53 -07:00
parent 5ce2481fec
commit fc3709507d
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/controlplane.go
View File

@@ -87,7 +87,13 @@ func UpgradeControlPlaneNodes(ctx context.Context, kubeClient *kubernetes.Client
logrus.Errorf("Failed to upgrade hosts: %v with error %v", strings.Join(hostsFailedToUpgrade, ","), err)
errMsgMaxUnavailableNotFailed = fmt.Sprintf("Failed to upgrade hosts: %v with error %v", strings.Join(hostsFailedToUpgrade, ","), err)
}
return errMsgMaxUnavailableNotFailed, util.ErrList([]error{err, inactiveHostErr})
var errors []error
for _, e := range []error{err, inactiveHostErr} {
if e != nil {
errors = append(errors, e)
}
}
return errMsgMaxUnavailableNotFailed, util.ErrList(errors)
}
log.Infof(ctx, "[%s] Successfully upgraded Controller Plane..", ControlRole)
return errMsgMaxUnavailableNotFailed, nil