If instance is in standby mode already, just return (keikoproj#138)

Signed-off-by: Oleg Atamanenko <[email protected]> Co-authored-by: Shri Javadekar <[email protected]> Signed-off-by: Alfredo Garo <[email protected]>
garomonegro · Dec 11, 2020 · b66dd54 · b66dd54
1 parent 4c9b140
commit b66dd54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/controllers/helpers.go b/controllers/helpers.go
@@ -76,7 +76,7 @@ func getInServiceIds(instances []*autoscaling.Instance) []string {
 	return list
 }
 
-func getGroupInstanceState(group *autoscaling.Group, instanceID string) (string, error) {
+func getInstanceStateInASG(group *autoscaling.Group, instanceID string) (string, error) {
 	for _, instance := range group.Instances {
 		if aws.StringValue(instance.InstanceId) == instanceID {
 			return aws.StringValue(instance.LifecycleState), nil

diff --git a/controllers/rollingupgrade_controller.go b/controllers/rollingupgrade_controller.go
@@ -334,28 +334,33 @@ func (r *RollingUpgradeReconciler) GetAutoScalingGroup(rollupName string) (*auto
 // SetStandby sets the autoscaling instance to standby mode.
 func (r *RollingUpgradeReconciler) SetStandby(ruObj *upgrademgrv1alpha1.RollingUpgrade, instanceID string) error {
 	r.info(ruObj, "Setting to stand-by", ruObj.Name, instanceID)
-	input := &autoscaling.EnterStandbyInput{
-		AutoScalingGroupName:           aws.String(ruObj.Spec.AsgName),
-		InstanceIds:                    aws.StringSlice([]string{instanceID}),
-		ShouldDecrementDesiredCapacity: aws.Bool(false),
-	}
 
 	asg, err := r.GetAutoScalingGroup(ruObj.Name)
 	if err != nil {
 		return err
 	}
 
-	instanceState, err := getGroupInstanceState(asg, instanceID)
+	instanceState, err := getInstanceStateInASG(asg, instanceID)
 	if err != nil {
 		r.info(ruObj, fmt.Sprintf("WARNING: %v", err))
 		return nil
 	}
 
+	if instanceState == autoscaling.LifecycleStateStandby {
+		return nil
+	}
+
 	if !isInServiceLifecycleState(instanceState) {
 		r.info(ruObj, "Cannot set instance to stand-by, instance is in state", "instanceState", instanceState, "instanceID", instanceID)
 		return nil
 	}
 
+	input := &autoscaling.EnterStandbyInput{
+		AutoScalingGroupName:           aws.String(ruObj.Spec.AsgName),
+		InstanceIds:                    aws.StringSlice([]string{instanceID}),
+		ShouldDecrementDesiredCapacity: aws.Bool(false),
+	}
+
 	_, err = r.ASGClient.EnterStandby(input)
 	if err != nil {
 		r.error(ruObj, err, "Failed to enter standby", "instanceID", instanceID)