Clean up loadbalancer pool members before delete instance

Signed-off-by: ekko <tuuwtu1@gmail.com>

api/v1alpha1/types.go

@@ -143,7 +143,7 @@ type Instance struct {
 	// +optional
 	DataVolumes []Volume `json:"dataVolumes,omitempty"`
 
-	// Addresses contains the AWS instance associated addresses.
+	// Addresses contains the ECS instance associated addresses.
 	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
 
 	// Availability zone of instance

internal/controller/huaweicloudmachine_controller.go

@@ -251,6 +251,12 @@ func (r *HuaweiCloudMachineReconciler) reconcileDelete(machineScope *scope.Machi
 
 	machineScope.Logger.Info("ECS instance found matching deleted HuaweiCloudMachine", "instance-id", instance.ID)
 
+	if machineScope.IsControlPlane() {
+		if err := ecsSvc.DetachInstanceFromElb(instance); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
 	// Check the instance state. If it's already shutting down or terminated,
 	// do nothing. Otherwise attempt to delete it.
 	switch instance.State {

pkg/services/ecs/instance.go

@@ -183,6 +183,10 @@ func (s *Service) CreateInstance(scope *scope.MachineScope, userData []byte,
 		return nil, err
 	}
 
+	// Set the providerID and instanceID as soon as we create an instance so that we keep it in case of errors afterward
+	scope.SetProviderID(out.ID, out.AvailabilityZone)
+	scope.SetInstanceID(out.ID)
+
 	return out, nil
 }
 
@@ -406,5 +410,5 @@ func (s *Service) AttachInstanceToElb(instance *infrav1.Instance) error {
 }
 
 func (s *Service) DetachInstanceFromElb(instance *infrav1.Instance) error {
-	return errors.New("DetachInstanceFromElb not implemented")
+	return s.elbService.DeleteMember(s.scope.ELB().Pools, instance)
 }

pkg/services/elb/loadbalancer.go

@@ -435,3 +435,31 @@ func (s *Service) CreateMember(pools []infrav1alpha1.PoolRef, instance *infrav1a
 	}
 	return nil
 }
+
+func (s *Service) DeleteMember(pools []infrav1alpha1.PoolRef, instance *infrav1alpha1.Instance) error {
+	for _, pool := range pools {
+		if pool.Id == "" {
+			continue
+		}
+		sdkPool, err := s.getPool(pool.Id)
+		if err != nil {
+			return err
+		}
+
+		members := sdkPool.Members
+		for _, member := range members {
+			if member.Id == "" {
+				continue
+			}
+			deleteMembersRequest := &elbmodel.BatchDeleteMembersRequest{Body: &elbmodel.BatchDeleteMembersRequestBody{Members: make([]elbmodel.BatchDeleteMembersOption, 0)}}
+			deleteMembersRequest.PoolId = sdkPool.Id
+			deleteMember := elbmodel.BatchDeleteMembersOption{Id: &member.Id}
+			deleteMembersRequest.Body.Members = append(deleteMembersRequest.Body.Members, deleteMember)
+			_, err = s.elbClient.BatchDeleteMembers(deleteMembersRequest)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}