Merge pull request #96 from xunpan/fix

return error for not found case makes checking existence fail

Author: gyliu513

pkg/cloud/ibmcloud/actuators/machine/actuator.go

@@ -129,6 +129,10 @@ func (ic *IbmCloudClient) Create(ctx context.Context, cluster *clusterv1.Cluster
 		return err
 	}
 
+	if guest == nil {
+		return fmt.Errorf("Guest host does not found")
+	}
+
 	return ic.updateAnnotation(machine, strconv.Itoa(*guest.Id))
 }
 
@@ -167,11 +171,12 @@ func (ic *IbmCloudClient) Update(ctx context.Context, cluster *clusterv1.Cluster
 
 // Exists test for the existance of a machine and is invoked by the Machine Controller
 func (ic *IbmCloudClient) Exists(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) (bool, error) {
-	_, err := ic.getGuest(machine)
+	guest, err := ic.getGuest(machine)
 	if err != nil {
 		return false, err
 	}
-	return true, nil
+
+	return guest != nil, nil
 }
 
 func (ic *IbmCloudClient) getGuest(machine *clusterv1.Machine) (*datatypes.Virtual_Guest, error) {

pkg/cloud/ibmcloud/clients/machines.go

@@ -188,7 +188,7 @@ func (gs *GuestService) GetGuest(name string) (*datatypes.Virtual_Guest, error)
 			return &guest, nil
 		}
 	}
-	return nil, fmt.Errorf("Virtual guest %q does not found", name)
+	return nil, nil
 }
 
 // TODO: directly get ID of ssh key instead of list and search