only two times

kubernetes · Dec 11, 2019 · cf4840f · cf4840f
1 parent 7af196f
commit cf4840f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cmd/kops/rollingupdatecluster.go b/cmd/kops/rollingupdatecluster.go
@@ -415,7 +415,7 @@ func RunRollingUpdateCluster(f *util.Factory, out io.Writer, options *RollingUpd
 		ValidationTimeout: options.ValidationTimeout,
 		// TODO should we expose this to the UI?
 		ValidateTickDuration:    30 * time.Second,
-		ValidateSuccessDuration: 15 * time.Second,
+		ValidateSuccessDuration: 10 * time.Second,
 	}
 	return d.RollingUpdate(groups, cluster, list)
 }
diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go
@@ -248,15 +248,18 @@ func (r *RollingUpdateInstanceGroup) validateClusterWithDuration(rollingUpdateDa
 	}
 }
 
-// validateClusterWithDurationLoop validates cluster 3 times to make sure cluster does not flap
+// validateClusterWithDurationLoop validates cluster 2 times to make sure cluster does not flap
 func (r *RollingUpdateInstanceGroup) validateClusterWithDurationLoop(rollingUpdateData *RollingUpdateCluster, duration time.Duration) error {
 	var err error
-	for i := 1; i <= 3; i++ {
+	for i := 1; i <= 2; i++ {
 		err = r.validateClusterWithDuration(rollingUpdateData, duration)
 		if err != nil {
 			return err
 		}
-		time.Sleep(rollingUpdateData.ValidateSuccessDuration / 3)
+		if i == 2 {
+			break
+		}
+		time.Sleep(rollingUpdateData.ValidateSuccessDuration)
 	}
 	return nil
 }