Merge pull request #294 from microsoft/user/matthewchen/fix-pnf

Add Generic Not Found case

Author: mchen727

api/v1beta1/conditions_consts.go

@@ -38,6 +38,8 @@ const (
 	OutOfNodeCapacityReason = "OutOfNodeCapacity"
 	// PathNotFoundReason used when the AzureStackHCI GalleryImage is not found.
 	PathNotFoundReason = "PathNotFound"
+	// NotFoundReason used as a generic error reason when a resource is not found.
+	NotFoundReason = "NotFound"
 )
 
 // Conditions and condition Reasons for the AzureStackHCICluster object

controllers/azurestackhcivirtualmachine_controller.go

@@ -24,6 +24,7 @@ import (
 	"github.com/microsoft/cluster-api-provider-azurestackhci/cloud/scope"
 	infrav1util "github.com/microsoft/cluster-api-provider-azurestackhci/pkg/util"
 	mocerrors "github.com/microsoft/moc/pkg/errors"
+	moccodes "github.com/microsoft/moc/pkg/errors/codes"
 	"github.com/pkg/errors"
 
 	corev1 "k8s.io/api/core/v1"
@@ -209,9 +210,16 @@ func (r *AzureStackHCIVirtualMachineReconciler) getOrCreate(virtualMachineScope
 			case mocerrors.OutOfCapacity.Error():
 				conditions.MarkFalse(virtualMachineScope.AzureStackHCIVirtualMachine, infrav1.VMRunningCondition, infrav1.OutOfCapacityReason, clusterv1.ConditionSeverityError, err.Error())
 			case mocerrors.OutOfNodeCapacity.Error():
-				conditions.MarkFalse(virtualMachineScope.AzureStackHCIVirtualMachine, infrav1.VMRunningCondition, infrav1.OutOfNodeCapacityReason, clusterv1.ConditionSeverityWarning, err.Error())
-			case mocerrors.PathNotFound.Error():
-				conditions.MarkFalse(virtualMachineScope.AzureStackHCIVirtualMachine, infrav1.VMRunningCondition, infrav1.PathNotFoundReason, clusterv1.ConditionSeverityError, err.Error())
+				conditions.MarkFalse(virtualMachineScope.AzureStackHCIVirtualMachine, infrav1.VMRunningCondition, infrav1.OutOfNodeCapacityReason, clusterv1.ConditionSeverityWarning, err.Error())			
+			case mocerrors.NotFound.Error(): // "NotFound"
+				fallthrough
+			// Internally, NotFound is a legacy error and returns the error string instead.
+			case moccodes.NotFound.String(): // "Not Found"
+				if mocerrors.IsPathNotFound(err) {
+					conditions.MarkFalse(virtualMachineScope.AzureStackHCIVirtualMachine, infrav1.VMRunningCondition, infrav1.PathNotFoundReason, clusterv1.ConditionSeverityError, err.Error())
+				} else {					
+					conditions.MarkFalse(virtualMachineScope.AzureStackHCIVirtualMachine, infrav1.VMRunningCondition, infrav1.NotFoundReason, clusterv1.ConditionSeverityError, err.Error())
+				}
 			default:
 				conditions.MarkFalse(virtualMachineScope.AzureStackHCIVirtualMachine, infrav1.VMRunningCondition, infrav1.VMProvisionFailedReason, clusterv1.ConditionSeverityError, err.Error())
 			}