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

Improve logging of cluster revalidation

This commit is contained in:
John Gardiner Myers 2019-12-13 13:48:47 -08:00
parent 19e165759b
commit 2850826a52
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/instancegroups/instancegroups.go
View File

@ -251,6 +251,12 @@ func (r *RollingUpdateInstanceGroup) validateClusterWithDuration(rollingUpdateDa
func (r *RollingUpdateInstanceGroup) tryValidateCluster(rollingUpdateData *RollingUpdateCluster, duration time.Duration, tickDuration time.Duration) bool {
result, err := rollingUpdateData.ClusterValidator.Validate()
if err == nil && len(result.Failures) == 0 && rollingUpdateData.ValidateSuccessDuration > 0 {
klog.Infof("Cluster validated; revalidating in %s to make sure it does not flap.", rollingUpdateData.ValidateSuccessDuration)
time.Sleep(rollingUpdateData.ValidateSuccessDuration)
result, err = rollingUpdateData.ClusterValidator.Validate()
}
if err != nil {
klog.Infof("Cluster did not validate, will try again in %q until duration %q expires: %v.", tickDuration, duration, err)
return false
@ -262,15 +268,8 @@ func (r *RollingUpdateInstanceGroup) tryValidateCluster(rollingUpdateData *Rolli
klog.Infof("Cluster did not pass validation, will try again in %q until duration %q expires: %s.", tickDuration, duration, strings.Join(messages, ", "))
return false
} else {
klog.Info("Cluster validated, revalidating to make sure it does not flap.")
time.Sleep(rollingUpdateData.ValidateSuccessDuration)
result, err = rollingUpdateData.ClusterValidator.Validate()
if err == nil && len(result.Failures) == 0 {
klog.Info("Cluster validated.")
return true
}
klog.Info("Cluster did not revalidate.")
return false
klog.Info("Cluster validated.")
return true
}
}