Merge pull request #97 from aws/fix-issues-found-by-e2e

Fixup E2E Findings

Author: wongni

controllers/cloudstackmachine_controller.go

@@ -249,20 +249,18 @@ func (r *CloudStackMachineReconciliationRunner) GetOrCreateMachineStateChecker()
 }
 
 func (r *CloudStackMachineReconciliationRunner) ReconcileDelete() (retRes ctrl.Result, reterr error) {
-	if r.ReconciliationSubject.Spec.InstanceID == nil {
-		r.Log.Info("VM Instance ID is nil")
-		return ctrl.Result{}, nil
-	}
-	r.Log.Info("Deleting instance", "instance-id", r.ReconciliationSubject.Spec.InstanceID)
-	// Use CSClient instead of CSUser here to expunge as admin.
-	// The CloudStack-Go API does not return an error, but the VM won't delete with Expunge set if requested by
-	// non-domain admin user.
-	if err := r.CSClient.DestroyVMInstance(r.ReconciliationSubject); err != nil {
-		if err.Error() == "VM deletion in progress" {
-			r.Log.Info(err.Error())
-			return ctrl.Result{RequeueAfter: utils.DestoryVMRequeueInterval}, nil
+	if r.ReconciliationSubject.Spec.InstanceID != nil {
+		r.Log.Info("Deleting instance", "instance-id", r.ReconciliationSubject.Spec.InstanceID)
+		// Use CSClient instead of CSUser here to expunge as admin.
+		// The CloudStack-Go API does not return an error, but the VM won't delete with Expunge set if requested by
+		// non-domain admin user.
+		if err := r.CSClient.DestroyVMInstance(r.ReconciliationSubject); err != nil {
+			if err.Error() == "VM deletion in progress" {
+				r.Log.Info(err.Error())
+				return ctrl.Result{RequeueAfter: utils.DestoryVMRequeueInterval}, nil
+			}
+			return ctrl.Result{}, err
 		}
-		return ctrl.Result{}, err
 	}
 	r.Log.Info("VM Deleted")
 	controllerutil.RemoveFinalizer(r.ReconciliationSubject, infrav1.MachineFinalizer)

controllers/cloudstackmachinestatechecker_controller.go

@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -73,7 +74,7 @@ func (r *CloudStackMachineStateCheckerReconciliationRunner) Reconcile() (ctrl.Re
 		return res, err
 	}
 
-	if err := r.CSClient.ResolveVMInstanceDetails(r.CSMachine); err != nil {
+	if err := r.CSClient.ResolveVMInstanceDetails(r.CSMachine); err != nil && !strings.Contains(strings.ToLower(err.Error()), "no match found") {
 		return r.ReturnWrappedError(err, "failed to resolve VM instance details")
 	}
 	if r.CSMachine.Status.InstanceState == "Running" {

pkg/cloud/user_credentials.go

@@ -74,8 +74,8 @@ func (c *client) ResolveDomain(domain *Domain) error {
 			tokens = append([]string{rootDomain}, tokens...)
 		} else {
 			tokens[0] = rootDomain
-			domain.Path = strings.Join(tokens, domainDelimiter)
 		}
+		domain.Path = strings.Join(tokens, domainDelimiter)
 	}
 
 	// Set present search/list parameters.