Treat no match found error as a non-error in machine state checker controller to reconcile the removed VM instance

wongni · wongni · commit abae024639ff · 2022-05-17T13:16:56.000-05:00
diff --git a/controllers/cloudstackmachinestatechecker_controller.go b/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" {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package controllers`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
	`21`	`+ "strings"`
`21`	`22`	`"time"`
`22`	`23`
`23`	`24`	`ctrl "sigs.k8s.io/controller-runtime"`
`@@ -73,7 +74,7 @@ func (r *CloudStackMachineStateCheckerReconciliationRunner) Reconcile() (ctrl.Re`
`73`	`74`	`return res, err`
`74`	`75`	`}`
`75`	`76`
`76`		`- if err := r.CSClient.ResolveVMInstanceDetails(r.CSMachine); err != nil {`
	`77`	`+ if err := r.CSClient.ResolveVMInstanceDetails(r.CSMachine); err != nil && !strings.Contains(strings.ToLower(err.Error()), "no match found") {`
`77`	`78`	`return r.ReturnWrappedError(err, "failed to resolve VM instance details")`
`78`	`79`	`}`
`79`	`80`	`if r.CSMachine.Status.InstanceState == "Running" {`