Merge pull request kubernetes#3676 from wangshiqi308/pr_fix_scaledown_issue

fixed scaledown issue

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud_auto_scaling_group.go

@@ -94,26 +94,25 @@ func (asg *AutoScalingGroup) IncreaseSize(delta int) error {
 func (asg *AutoScalingGroup) DeleteNodes(nodes []*apiv1.Node) error {
 	instances, err := asg.cloudServiceManager.GetInstances(asg.groupID)
 	if err != nil {
-		klog.Warningf("failed to get nodes from group: %s, error: %v", asg.groupID, err)
+		klog.Warningf("failed to get instances from group: %s, error: %v", asg.groupID, err)
 		return err
 	}
 
-	// TODO(RainbowMango): Check if all node in this group.
-	//  If one of the node is not belong to this group, just return error.
-
-	servers := make([]string, 0, len(instances))
+	instanceIds := make([]string, 0, len(instances))
 	for _, instance := range instances {
-		servers = append(servers, instance.Id)
+		for _, n := range nodes {
+			if n.Spec.ProviderID == instance.Id {
+				instanceIds = append(instanceIds, instance.Id)
+			}
+		}
 	}
 
-	err = asg.cloudServiceManager.DeleteServers(servers)
+	err = asg.cloudServiceManager.DeleteScalingInstances(asg.groupID, instanceIds)
 	if err != nil {
-		klog.Warningf("failed to delete nodes. error: %v", err)
+		klog.Warningf("failed to delete scaling instances. error: %v", err)
 		return err
 	}
 
-	// TODO(RainbowMango): Wait for node group size updated.
-
 	return nil
 }
 

cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud_service_manager.go

@@ -62,6 +62,9 @@ type AutoScalingService interface {
 	// IncreaseSizeInstance wait until instance number is updated.
 	IncreaseSizeInstance(groupID string, delta int) error
 
+	// DeleteScalingInstances is used to delete instances from auto scaling group by instanceIDs.
+	DeleteScalingInstances(groupID string, instanceIds []string) error
+
 	// Get default auto scaling group template
 	getAsgTemplate(groupID string) (*asgTemplate, error)
 
@@ -218,6 +221,29 @@ func (csm *cloudServiceManager) GetInstances(groupID string) ([]cloudprovider.In
 	return instances, nil
 }
 
+func (csm *cloudServiceManager) DeleteScalingInstances(groupID string, instanceIds []string) error {
+	asClient := csm.getASClientFunc()
+
+	instanceDelete := "yes"
+	opts := &huaweicloudsdkasmodel.UpdateScalingGroupInstanceRequest{
+		ScalingGroupId: groupID,
+		Body: &huaweicloudsdkasmodel.UpdateScalingGroupInstanceRequestBody{
+			InstancesId:    instanceIds,
+			InstanceDelete: &instanceDelete,
+			Action:         huaweicloudsdkasmodel.GetUpdateScalingGroupInstanceRequestBodyActionEnum().REMOVE,
+		},
+	}
+
+	_, err := asClient.UpdateScalingGroupInstance(opts)
+
+	if err != nil {
+		klog.Errorf("failed to delete scaling instances. group: %s, error: %v", groupID, err)
+		return err
+	}
+
+	return nil
+}
+
 // IncreaseSizeInstance increases a scaling group's instance size.
 // The workflow works as follows:
 // 1. create scaling policy with scheduled type.